System test on conflicting files when publishing. #65

system/t06_publish/PublishRepo24Test/pyspi_0.6.1-1.5.dsc

@@ -0,0 +1,12 @@
+Format: 1.0
+Source: pyspi
+Binary: python-at-spi
+Architecture: any
+Version: 0.6.1-1.5
+Maintainer: Jose Carlos Garcia Sogo <jsogo@debian.org>
+Homepage: http://people.redhat.com/zcerza/dogtail
+Standards-Version: 3.7.3
+Vcs-Svn: svn://svn.tribulaciones.org/srv/svn/pyspi/trunk
+Build-Depends: debhelper (>= 5), cdbs, libatspi-dev, python-pyrex, python-support (>= 0.4), python-all-dev, libx11-dev
+Files:
+ d41d8cd98f00b204e9800998ecf8427e 0 pyspi_0.6.1.orig.tar.gz

system/t06_publish/PublishRepo24Test_gold

@@ -0,0 +1,3 @@
+Loading packages...
+Generating metadata files and linking package files...
+ERROR: unable to publish: unable to process packages: error linking file to /Users/smira/.aptly/public/pool/main/p/pyspi/pyspi_0.6.1.orig.tar.gz: file already exists and is different

system/t06_publish/__init__.py

@@ -2,9 +2,9 @@
 Testing publishing snapshots
 """
 
-# from .drop import *
-# from .list import *
-# from .repo import *
-# from .snapshot import *
-# from .switch import *
+from .drop import *
+from .list import *
+from .repo import *
+from .snapshot import *
+from .switch import *
 from .update import *

system/t06_publish/repo.py

@@ -548,3 +548,18 @@ class PublishRepo23Test(BaseTest):
     runCmd = "aptly publish repo -component=main,contrib repo1"
     expectedCode = 2
     outputMatchPrepare = lambda _, s: "\n".join([l for l in s.split("\n") if l.startswith("ERROR")])
+
+
+class PublishRepo24Test(BaseTest):
+    """
+    publish repo: conflicting files in the repo
+    """
+    fixtureCmds = [
+        "aptly repo create local-repo1",
+        "aptly repo add local-repo1 ${files}",
+        "aptly repo create local-repo2",
+        "aptly repo add local-repo2 ${testfiles}",
+        "aptly publish repo -keyring=${files}/aptly.pub -secret-keyring=${files}/aptly.sec -distribution=maverick local-repo1",
+    ]
+    runCmd = "aptly publish repo -keyring=${files}/aptly.pub -secret-keyring=${files}/aptly.sec -distribution=squeeze local-repo2"
+    expectedCode = 1