From 5b75dbc4814d1d1e3e6228d368fed4deea90e85a Mon Sep 17 00:00:00 2001 From: Andrey Smirnov Date: Sun, 18 May 2014 00:16:00 +0400 Subject: [PATCH] Fix system tests. #54 --- system/t09_repo/AddRepo8Test_gold | 2 +- system/t09_repo/add.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/system/t09_repo/AddRepo8Test_gold b/system/t09_repo/AddRepo8Test_gold index 920f46c0..e1196ca3 100644 --- a/system/t09_repo/AddRepo8Test_gold +++ b/system/t09_repo/AddRepo8Test_gold @@ -1,5 +1,5 @@ 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 [!] 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 diff --git a/system/t09_repo/add.py b/system/t09_repo/add.py index 7da576f9..225326b1 100644 --- a/system/t09_repo/add.py +++ b/system/t09_repo/add.py @@ -175,7 +175,7 @@ class AddRepo8Test(BaseTest): "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" - 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 def check(self): @@ -191,8 +191,8 @@ class AddRepo9Test(BaseTest): "aptly repo create -comment=Repo9 -distribution=squeeze repo9", ] 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 + outputMatchPrepare = lambda self, s: s.replace(os.path.join(os.path.dirname(inspect.getsourcefile(BaseTest)), "files"), "") expectedCode = 1 def prepare(self):