From 69ad2ccd84713364938237f60fd1d8224402da02 Mon Sep 17 00:00:00 2001 From: Andrey Smirnov Date: Wed, 16 Jul 2014 13:45:46 +0400 Subject: [PATCH] System tests for mirror create with filter. #64 --- system/t04_mirror/CreateMirror22Test_gold | 4 ++++ .../t04_mirror/CreateMirror22Test_mirror_show | 22 +++++++++++++++++++ system/t04_mirror/CreateMirror23Test_gold | 1 + system/t04_mirror/create.py | 22 +++++++++++++++++++ 4 files changed, 49 insertions(+) create mode 100644 system/t04_mirror/CreateMirror22Test_gold create mode 100644 system/t04_mirror/CreateMirror22Test_mirror_show create mode 100644 system/t04_mirror/CreateMirror23Test_gold diff --git a/system/t04_mirror/CreateMirror22Test_gold b/system/t04_mirror/CreateMirror22Test_gold new file mode 100644 index 00000000..baa0c00a --- /dev/null +++ b/system/t04_mirror/CreateMirror22Test_gold @@ -0,0 +1,4 @@ +Downloading http://security.debian.org/dists/wheezy/updates/Release... + +Mirror [mirror22]: http://security.debian.org/ wheezy/updates successfully added. +You can run 'aptly mirror update mirror22' to download repository contents. diff --git a/system/t04_mirror/CreateMirror22Test_mirror_show b/system/t04_mirror/CreateMirror22Test_mirror_show new file mode 100644 index 00000000..add4d654 --- /dev/null +++ b/system/t04_mirror/CreateMirror22Test_mirror_show @@ -0,0 +1,22 @@ +Name: mirror22 +Archive Root URL: http://security.debian.org/ +Distribution: wheezy/updates +Components: main +Architectures: amd64, armel, armhf, i386, ia64, kfreebsd-amd64, kfreebsd-i386, mips, mipsel, powerpc, s390, s390x, sparc +Download Sources: no +Filter: nginx | Priority (required) +Filter With Deps: no +Last update: never + +Information from release file: +Architectures: amd64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc +Codename: wheezy +Components: updates/main updates/contrib updates/non-free +Date: Sun, 13 Jul 2014 12:12:08 UTC +Description: Debian 7.0 Security Updates + +Label: Debian-Security +Origin: Debian +Suite: stable +Valid-Until: Wed, 23 Jul 2014 12:12:08 UTC +Version: 7.0 diff --git a/system/t04_mirror/CreateMirror23Test_gold b/system/t04_mirror/CreateMirror23Test_gold new file mode 100644 index 00000000..2cc5078b --- /dev/null +++ b/system/t04_mirror/CreateMirror23Test_gold @@ -0,0 +1 @@ +ERROR: unable to create mirror: parsing failed: unexpected token : expecting field or package name diff --git a/system/t04_mirror/create.py b/system/t04_mirror/create.py index 4faa8277..91575aa9 100644 --- a/system/t04_mirror/create.py +++ b/system/t04_mirror/create.py @@ -251,3 +251,25 @@ class CreateMirror21Test(BaseTest): self.check_output() self.check_cmd_output("aptly mirror show mirror21", "mirror_show", match_prepare=removeSHA512) + + +class CreateMirror22Test(BaseTest): + """ + create mirror: mirror with filter + """ + runCmd = "aptly mirror create -ignore-signatures -filter='nginx | Priority (required)' mirror22 http://security.debian.org/ wheezy/updates main" + + def check(self): + def removeDates(s): + return re.sub(r"(Date|Valid-Until): [,0-9:+A-Za-z -]+\n", "", s) + + self.check_output() + self.check_cmd_output("aptly mirror show mirror22", "mirror_show", match_prepare=removeDates) + + +class CreateMirror23Test(BaseTest): + """ + create mirror: mirror with wrong filter + """ + runCmd = "aptly mirror create -ignore-signatures -filter='nginx | ' mirror23 http://security.debian.org/ wheezy/updates main" + expectedCode = 1