vincent/aptly
1
0
Fork 0
mirror of https://github.com/aptly-dev/aptly.git synced 2026-05-08 22:30:41 +00:00
Code Issues Projects Releases Wiki Activity

Fix system tests. #54

Browse Source
This commit is contained in:
Andrey Smirnov
2014-05-18 00:16:00 +04:00
parent d96839f99d
commit 5b75dbc481
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
system/t09_repo/AddRepo8Test_gold
+1 -1
View File
@@ -1,5 +1,5 @@
Loading packages... Loading packages...
[!] Unable to save package pyspi_0.6.1-1.3_source: unable to save: pyspi_0.6.1-1.3_source, conflict with existing package [!] Unable to save package pyspi_0.6.1-1.3_source: unable to save: pyspi_0.6.1-1.3_source, conflict with existing package
[!] Some files were skipped due to errors: [!] Some files were skipped due to errors:
/Users/smira/Documents/go/src/github.com/smira/aptly/system/t09_repo/AddRepo8Test/pyspi_0.6.1-1.3.conflict.dsc /pyspi_0.6.1-1.3.conflict.dsc
ERROR: Some files failed to be added ERROR: Some files failed to be added
system/t09_repo/add.py
+2 -2
View File
@@ -175,7 +175,7 @@ class AddRepo8Test(BaseTest):
"aptly repo add repo8 ${files}/pyspi_0.6.1-1.3.dsc", "aptly repo add repo8 ${files}/pyspi_0.6.1-1.3.dsc",
] ]
runCmd = "aptly repo add repo8 ${testfiles}/pyspi_0.6.1-1.3.conflict.dsc" runCmd = "aptly repo add repo8 ${testfiles}/pyspi_0.6.1-1.3.conflict.dsc"
outputMatchPrepare = lambda self, s: s.replace(os.path.join(os.path.dirname(inspect.getsourcefile(BaseTest)), "files"), "") outputMatchPrepare = lambda self, s: s.replace(os.path.join(os.path.dirname(inspect.getsourcefile(self.__class__)), self.__class__.__name__), "").replace(os.path.join(os.path.dirname(inspect.getsourcefile(BaseTest)), "files"), "")
expectedCode = 1 expectedCode = 1
def check(self): def check(self):
@@ -191,8 +191,8 @@ class AddRepo9Test(BaseTest):
"aptly repo create -comment=Repo9 -distribution=squeeze repo9", "aptly repo create -comment=Repo9 -distribution=squeeze repo9",
] ]
runCmd = "aptly repo add repo9 ${files}/pyspi_0.6.1-1.3.dsc" runCmd = "aptly repo add repo9 ${files}/pyspi_0.6.1-1.3.dsc"
outputMatchPrepare = lambda self, s: s.replace(os.path.join(os.path.dirname(inspect.getsourcefile(self.__class__)), self.__class__.__name__), "").replace(os.path.join(os.path.dirname(inspect.getsourcefile(BaseTest)), "files"), "")
gold_processor = BaseTest.expand_environ gold_processor = BaseTest.expand_environ
outputMatchPrepare = lambda self, s: s.replace(os.path.join(os.path.dirname(inspect.getsourcefile(BaseTest)), "files"), "")
expectedCode = 1 expectedCode = 1
def prepare(self): def prepare(self):