From: Torsten Werner <twerner@debian.org>
Date: Sat, 8 Jan 2011 18:30:13 +0000 (+0100)
Subject: fix paths in test_copy_installer to work on franck
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=d0c606466fbc892a05b2c551f20539c67ace74f1;p=dak.git

fix paths in test_copy_installer to work on franck

Signed-off-by: Torsten Werner <twerner@debian.org>
---

diff --git a/tests/fixtures/dak.conf b/tests/fixtures/dak.conf
index 1c50af07..9c0bfe51 100644
--- a/tests/fixtures/dak.conf
+++ b/tests/fixtures/dak.conf
@@ -20,5 +20,5 @@ Component
 
 Dir
 {
-  Root "fixtures/ftp/";
+  Root "tests/fixtures/ftp/";
 };
diff --git a/tests/test_copy_installer.py b/tests/test_copy_installer.py
index 440e4c12..09bd13a6 100755
--- a/tests/test_copy_installer.py
+++ b/tests/test_copy_installer.py
@@ -26,9 +26,9 @@ class ImportTestCase(DakTestCase):
 
     def test_dir_names(self):
         copier = InstallerCopier(version = '20110106')
-        self.assertEqual('fixtures/ftp/dists/unstable/main',
+        self.assertEqual('tests/fixtures/ftp/dists/unstable/main',
                 copier.source_dir)
-        self.assertEqual('fixtures/ftp/dists/testing/main',
+        self.assertEqual('tests/fixtures/ftp/dists/testing/main',
                 copier.dest_dir)
 
     def missing_source(self):
@@ -46,11 +46,11 @@ class ImportTestCase(DakTestCase):
         self.assertEqual(['amd64'], copier.architectures)
         self.assertEqual(['i386'], copier.skip_architectures)
         self.assertEqual( \
-            [('fixtures/ftp/dists/unstable/main/installer-amd64/20110106', \
-              'fixtures/ftp/dists/testing/main/installer-amd64/20110106'),], \
+            [('tests/fixtures/ftp/dists/unstable/main/installer-amd64/20110106', \
+              'tests/fixtures/ftp/dists/testing/main/installer-amd64/20110106'),], \
             copier.trees_to_copy)
         self.assertEqual([('20110106', \
-            'fixtures/ftp/dists/testing/main/installer-amd64/current')], \
+            'tests/fixtures/ftp/dists/testing/main/installer-amd64/current')], \
             copier.symlinks_to_create)
         self.assertEqual('''
 Will copy installer version 20110106 from suite unstable to