Commits

theoden  committed 3706160

Healed all the tests from the "misc" set, except PipSetupTest.

  • Participants
  • Parent commits d3ac813

Comments (0)

Files changed (2)

File fab_deploy_tests/tests/deploy.py

 
         foo_port = env.conf.PORTS['apache']
         self.assertPortNotBound(foo_port)
-        self.assertFileExists('/etc/apache2/sites-enabled/foo')
+        self.assertFileExists('/etc/apache2/sites-enabled/foo_apache.config')
 
         fab(apacheNoConfig.restart)
         self.assertPortBound(foo_port)
         self.assertPortBound(bar_port)
 
     def test_apache_make_wsgi(self):
-        self.assertNoFile(env.conf.ENV_DIR+'/var/wsgi/foo.py')
+        self.assertNoFile(env.conf.ENV_DIR+'/var/wsgi/foo/django_wsgi.py')
         fab(Apache(wsgi='django_wsgi.py').upload_wsgi)
-        self.assertFileExists(env.conf.ENV_DIR+'/var/wsgi/foo.py')
+        self.assertFileExists(env.conf.ENV_DIR+'/var/wsgi/foo/django_wsgi.py')
 
 
 class DeployTest(FabDeployProjectTest):

File fab_deploy_tests/tests/virtualenv.py

 from fabtest import fab
 from fab_deploy import pip
 from .deploy import FabDeployProjectTest
+from ..test_project2.fabfile import foo_site as foo_site2, project as project2
 
 class NoPipSetupTest(FabDeployProjectTest):
     def test_no_pip_conf(self):
-        self.assertNoFile(env.conf.HOME_DIR+'/pip.conf')
+        self.assertNoFile(env.conf.HOME_DIR+'/.pip/pip.conf')
         fab(pip.setup_conf)
-        self.assertNoFile(env.conf.HOME_DIR+'/pip.conf')
+        self.assertNoFile(env.conf.HOME_DIR+'/.pip/pip.conf')
 
 class PipSetupTest(FabDeployProjectTest):
-    project = 'test_project2'
+    project_dir = 'test_project2'
+    project = project2
 
     def test_pip_conf(self):
-        self.assertNoFile(env.conf.HOME_DIR+'/pip.conf')
+        fab(foo_site2)
+        self.assertNoFile(env.conf.HOME_DIR+'/.pip/pip.conf')
         fab(pip.setup_conf)
-        self.assertFileExists(env.conf.HOME_DIR+'/pip.conf')
+        self.assertFileExists(env.conf.HOME_DIR+'/.pip/pip.conf')