Merge lp:~allanlesage/helipad/test-fixes into lp:helipad/ci

[Chris Johnston]

[Chris Johnston (cjohnston)]

I'm seeing:

======================================================================
FAIL: test_get_integration_status_fail_build (ci.tests.unit.test_heuristics.TestHeuristics)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/chris/dashboard/some-ci-reviews/ci/tests/unit/test_heuristics.py", line 67, in test_get_integration_status_fail_build
    self.assertEqual(ret, 'Failed build')
AssertionError: 'Build failed' != 'Failed build'

======================================================================
FAIL: test_get_integration_status_fail_check (ci.tests.unit.test_heuristics.TestHeuristics)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/chris/dashboard/some-ci-reviews/ci/tests/unit/test_heuristics.py", line 74, in test_get_integration_status_fail_check
    self.assertEqual(ret, 'Failed check')
AssertionError: 'Testing failed' != 'Failed check'

======================================================================
FAIL: test_get_integration_status_fail_prepare (ci.tests.unit.test_heuristics.TestHeuristics)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/chris/dashboard/some-ci-reviews/ci/tests/unit/test_heuristics.py", line 60, in test_get_integration_status_fail_prepare
    self.assertEqual(ret, 'Failed prepare')
AssertionError: 'Prepare failed' != 'Failed prepare'

[Allan LeSage (allanlesage)]

Chris would you tell me how you're running your tests? I just want to be sure that I have the same env set up.

[Chris Johnston (cjohnston)]

Production like env. Using postgres.

=== modified file 'tests/__init__.py'
--- tests/__init__.py	2013-07-16 17:11:09 +0000
+++ tests/__init__.py	2013-07-26 16:05:52 +0000
@@ -12,3 +12,8 @@
 
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#from test_jenkins_pull_ci import *
+#from extractor import *
+#from integration import *
+from unit import *

=== modified file 'tests/extractor/__init__.py'
--- tests/extractor/__init__.py	2013-07-16 17:11:09 +0000
+++ tests/extractor/__init__.py	2013-07-26 16:05:52 +0000
@@ -12,3 +12,11 @@
 
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+from test_jenkins_build import *
+from test_jenkins_job import *
+from test_jenkins_test_report import *
+from test_extractor import *
+from test_jenkins_coverage import *
+from test_jenkins_run import *
+from test_jenkins_test_report import *

=== modified file 'tests/integration/__init__.py'
--- tests/integration/__init__.py	2013-07-16 17:11:09 +0000
+++ tests/integration/__init__.py	2013-07-26 16:05:52 +0000
@@ -12,3 +12,11 @@
 
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+from test_django_jenkins_build import *
+from test_jenkins_build import *
+from test_jenkins_job import *
+from test_view_build import *
+from test_view_daily_release_overview import *
+from test_view_index import *
+from test_view_stack import *

=== modified file 'tests/test_jenkins_pull_ci.py'
--- tests/test_jenkins_pull_ci.py	2013-07-19 16:19:58 +0000
+++ tests/test_jenkins_pull_ci.py	2013-07-26 16:05:52 +0000
@@ -146,7 +146,7 @@
             'name': 'fake_stack_name',
             'series': 'fake series',
             'ppa': 'fake_ppa',
-            'server': 'http://10.97.0.1:8080',
+            'server': 'http://10.97.2.10:8080',
             'job': 'cu2d-fake_stack_name-fake_release'}
         with patch('ci.management.commands.jenkins_pull_ci.create_cu2d_stack_from_config') \
                 as create_cu2d_stack_from_config:

=== modified file 'tests/unit/__init__.py'
--- tests/unit/__init__.py	2013-07-16 17:11:09 +0000
+++ tests/unit/__init__.py	2013-07-26 16:05:52 +0000
@@ -12,3 +12,25 @@
 
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+from test_build import *
+from test_ci_project_import import *
+from test_ci_project import *
+from test_cu2d_stack_import import *
+from test_cu2d_stack import *
+from test_heuristics import *
+from test_jenkins_build_import import *
+from test_jenkins_build import *
+from test_jenkins_coverage_report_import import *
+from test_jenkins_coverage_report import *
+from test_jenkins_flavor import *
+from test_jenkins_job_import import *
+from test_jenkins_job import *
+from test_jenkins_result import *
+from test_jenkins_run_import import *
+from test_jenkins_run import *
+from test_jenkins_test_report_import import *
+from test_launchpad_project_import import *
+from test_launchpad_project import *
+from test_release import *
+from test_series import *

=== modified file 'tests/unit/test_ci_project_import.py'
--- tests/unit/test_ci_project_import.py	2013-07-16 17:29:47 +0000
+++ tests/unit/test_ci_project_import.py	2013-07-26 16:05:52 +0000
@@ -32,57 +32,18 @@
         self.logger_patch.stop()
 
 
-class TestCreateFromName(CiProjectManagerTestCase):
-
-    def test_vanilla(self):
-        dummy_ci_project_name = 'fake-ci-project'
-        launchpad_project_get = MagicMock()
-        with patch('ci.models.LaunchpadProject.objects.get',
-                   launchpad_project_get), \
-                   patch('ci.models.CiProject.objects.create') as ci_project_create:
-            result = util_ci_project.create_ci_project_from_name(
-                name=dummy_ci_project_name)
-        ci_project_create.assert_called_with(
-            name=dummy_ci_project_name)
-        launchpad_project_get.assert_called_with(
-            name=dummy_ci_project_name)
-        # TODO come back and assert on ci_project_launchpad_project_add
-
-    def test_launchpad_project_doesnt_exist(self):
-        dummy_ci_project_name = 'fake-ci-project'
-        ci_project_create = MagicMock()
-        launchpad_project_get = MagicMock(
-            side_effect=LaunchpadProject.DoesNotExist)
-        with patch('ci.models.LaunchpadProject.objects.get',
-                   launchpad_project_get), \
-               patch('ci.models.CiProject.objects.create',
-                     ci_project_create), \
-               patch('ci.util.ci_project.create_launchpad_project_from_name'):
-            result = util_ci_project.create_ci_project_from_name(
-                name=dummy_ci_project_name)
-        ci_project_create.assert_called_with(
-            name=dummy_ci_project_name)
-        launchpad_project_get.assert_called_with(
-            name=dummy_ci_project_name)
-        # TODO come back and assert on ci_project_launchpad_project_add
-
-
-
-class TestCreateFromConfig(CiProjectManagerTestCase):
-
-    def test_vanilla(self):
+class TestCreate(CiProjectManagerTestCase):
+
+    def test_vanilla(self):
+        ci_project_get_or_create = MagicMock(
+            return_value=(MagicMock(), False))
         with patch('ci.models.Cu2dStack.objects.get'), \
                 patch('ci.models.Release.objects.get'), \
-                patch('ci.util.ci_project.create_ci_project_from_name') as \
-                      create_ci_project_from_name, \
                 patch('ci.util.ci_project.create_jenkins_job_from_name') as \
                       jenkins_job_create_from_name, \
-                patch('ci.models.CiProject.objects.get') as \
-                      ci_project_get:
-            create_ci_project_from_name.return_value = MagicMock(
-                stack="fake_stack",
-                release="fake_release")
-            result = util_ci_project.create_ci_project_from_config(
+                patch('ci.models.CiProject.objects.get_or_create',
+                      ci_project_get_or_create):
+            result = util_ci_project.create_ci_project(
                 {'name': 'fake_name',
                  'stack': 'fake_stack',
                  'release': 'fake_release',

=== modified file 'tests/unit/test_jenkins_build_import.py'
--- tests/unit/test_jenkins_build_import.py	2013-07-16 17:29:47 +0000
+++ tests/unit/test_jenkins_build_import.py	2013-07-26 16:05:52 +0000
@@ -16,7 +16,6 @@
 from mock import MagicMock, patch
 from django.test import TestCase
 from django.db import IntegrityError
-from unittest import skip
 from ci.models import JenkinsJob, JenkinsBuild
 import ci.util.extractor as extractor
 import ci.util.jenkins_build as util_jenkins_build
@@ -76,19 +75,29 @@
 
     def test_vanilla(self):
         get_text_from_url = MagicMock(side_effect=EnvironmentError)
-        get_json_from_url = MagicMock(side_effect=EnvironmentError)
-        jenkins_result_get_or_create = MagicMock(return_value=('fake_success_result', False))
-        with patch('ci.util.extractor.JenkinsBuild') as extractor_jenkins_build, \
-                patch('ci.util.extractor.get_downstream_builds_from_build'), \
-                patch('ci.util.extractor.get_text_from_url', get_text_from_url), \
-                patch('ci.util.extractor.get_json_from_url', get_text_from_url), \
-                patch('ci.models.JenkinsResult.objects.get_or_create',
-                      jenkins_result_get_or_create):
+        jenkins_result_get_or_create = MagicMock(
+            return_value=('fake_success_result', False),
+        )
+        with patch(
+            'ci.util.extractor.JenkinsBuild',
+        ) as extractor_jenkins_build, patch(
+            'ci.util.extractor.get_downstream_builds_from_build',
+        ), patch(
+            'ci.util.extractor.get_text_from_url',
+            get_text_from_url,
+        ), patch(
+            'ci.util.extractor.get_json_from_url',
+            get_text_from_url,
+        ), patch(
+            'ci.models.JenkinsResult.objects.get_or_create',
+            jenkins_result_get_or_create,
+        ):
             extractor_jenkins_build.return_value.number = 42
             extractor_jenkins_build.return_value.timestamp = 'fake_timestamp'
-            result = util_jenkins_build.create_jenkins_build_from_url(
+            util_jenkins_build.create_jenkins_build_from_url(
                 self.dummy_url,
-                self.dummy_jenkins_job)
+                self.dummy_jenkins_job,
+            )
         self.jenkins_build_objects_create.assert_called_with(
             jenkins_job=self.dummy_jenkins_job,
             url=self.dummy_url,
@@ -98,7 +107,7 @@
 
     def test_url_is_blacklisted(self):
         url = "http://10.97.2.10:8080/job/share-app-raring-armhf-ci/17/"
-        blacklist_jobs = ['raring',]
+        blacklist_jobs = ['raring', ]
         with patch('ci.util.jenkins_build.BLACKLIST_JOBS', blacklist_jobs):
             result = util_jenkins_build.create_jenkins_build_from_url(
                 url, self.dummy_jenkins_job)
@@ -107,7 +116,10 @@
     def test_extractor_build_barfs_on_us_properly(self):
         url = "http://10.97.2.10:8080/job/share-app-raring-armhf-ci/17/"
         extractor_jenkins_build_mock = MagicMock(side_effect=Exception)
-        with patch('ci.util.extractor.JenkinsBuild', extractor_jenkins_build_mock):
+        with patch(
+            'ci.util.extractor.JenkinsBuild',
+            extractor_jenkins_build_mock,
+        ):
             extractor_jenkins_build_mock.return_value.result = None
             result = util_jenkins_build.create_jenkins_build_from_url(
                 url, self.dummy_jenkins_job)
@@ -117,20 +129,35 @@
         """This probably means the build is running."""
 
         url = "http://10.97.2.10:8080/job/share-app-raring-armhf-ci/17/"
-        with patch('ci.util.extractor.JenkinsBuild') as extractor_jenkins_build_mock:
+        with patch(
+            'ci.util.extractor.JenkinsBuild',
+        ) as extractor_jenkins_build_mock:
             extractor_jenkins_build_mock.return_value.result = None
             result = util_jenkins_build.create_jenkins_build_from_url(
-                url, self.dummy_jenkins_job)
+                url, self.dummy_jenkins_job,
+            )
         self.assertIsNone(result)
 
     def test_build_duplicate_integrity_error(self):
         util_jenkins_build.create = MagicMock(side_effect=IntegrityError)
         get_coverage_report = MagicMock(side_effect=EnvironmentError)
-        jenkins_result_get_or_create = MagicMock(return_value=('fake_success_result', False))
-        with patch('ci.util.extractor.JenkinsBuild') as extractor_jenkins_build, \
-                patch('ci.util.extractor.get_downstream_builds_from_build_url'), \
-                patch('ci.util.extractor.get_coverage_report', get_coverage_report), \
-                patch('ci.models.JenkinsResult.objects.get_or_create', jenkins_result_get_or_create):
+        jenkins_result_get_or_create = MagicMock(
+            return_value=(
+                'fake_success_result',
+                False,
+            ),
+        )
+        with patch(
+            'ci.util.extractor.JenkinsBuild',
+        ) as extractor_jenkins_build, patch(
+            'ci.util.extractor.get_downstream_builds_from_build_url',
+        ), patch(
+            'ci.util.extractor.get_coverage_report',
+            get_coverage_report,
+        ), patch(
+            'ci.models.JenkinsResult.objects.get_or_create',
+            jenkins_result_get_or_create,
+        ):
             extractor_jenkins_build.return_value.number = 42
             extractor_jenkins_build.return_value.timestamp = 'fake_timestamp'
             result = util_jenkins_build.create_jenkins_build_from_url(
@@ -146,22 +173,34 @@
     def test_extractor_build_result_is_none(self):
         """Weird but extractor returns None for result b/c no builds at all."""
 
-        self.jenkins_build_objects_create = MagicMock(side_effect=IntegrityError)
+        self.jenkins_build_objects_create = MagicMock(
+            side_effect=IntegrityError,
+        )
         jenkins_result_get_or_create = MagicMock(side_effect=IntegrityError)
-        with patch('ci.util.extractor.JenkinsBuild') as extractor_jenkins_build, \
-                patch('ci.models.JenkinsResult.objects.get_or_create', jenkins_result_get_or_create):
+        with patch(
+            'ci.util.extractor.JenkinsBuild',
+        ) as extractor_jenkins_build, patch(
+            'ci.models.JenkinsResult.objects.get_or_create',
+            jenkins_result_get_or_create,
+        ):
             result = util_jenkins_build.create_jenkins_build_from_url(
-                self.dummy_url, self.dummy_jenkins_job)
+                self.dummy_url,
+                self.dummy_jenkins_job,
+            )
         self.assertIsNone(result)
 
 
 class TestCreateDownstreamBuilds(JenkinsBuildManagerTestCase):
 
-    @skip
     def test_vanilla(self):
-        get_downstream_builds_from_build = MagicMock(return_value=[extractor.BuildUrl(
-            url='http://s-jenkins:8080/job/mir-raring-i386-autolanding/3',
-            number=3)])
+        get_downstream_builds_from_build = MagicMock(
+            return_value=[
+                extractor.BuildUrl(
+                    url='http://jenkins/job/mir-raring-i386-autolanding/3',
+                    number=3,
+                ),
+            ],
+        )
         extractor_build = MagicMock()
         extractor_build.job_name = 'mir-raring-i386-autolanding'
         extractor_build.number = 3
@@ -170,25 +209,41 @@
         jenkins_build_get = MagicMock(return_value="fake_downstream_build")
         ci_jenkins_build = MagicMock()
         ci_extractor_build = MagicMock()
-        with patch('ci.util.extractor.get_downstream_builds_from_build', get_downstream_builds_from_build), \
-                patch('ci.util.extractor.JenkinsBuild', jenkins_build_mock), \
-                patch('ci.models.JenkinsJob.objects.get', jenkins_job_get), \
-                patch('ci.models.JenkinsBuild.objects.get', jenkins_build_get), \
-                patch.object(ci_jenkins_build, 'save') as ci_jenkins_build_save, \
-                patch.object(ci_jenkins_build, 'downstream_builds') as ci_jenkins_build_downstream_builds:
+        with patch(
+            'ci.util.extractor.get_downstream_builds_from_build',
+            get_downstream_builds_from_build,
+        ), patch('ci.util.extractor.JenkinsBuild', jenkins_build_mock), patch(
+            'ci.models.JenkinsJob.objects.get',
+            jenkins_job_get,
+        ), patch(
+            'ci.models.JenkinsBuild.objects.get',
+            jenkins_build_get,
+        ), patch.object(
+            ci_jenkins_build,
+            'save',
+        ) as ci_jenkins_build_save, patch.object(
+            ci_jenkins_build,
+            'downstream_builds',
+        ) as ci_jenkins_build_downstream_builds:
             ci_jenkins_build_downstream_builds.add = MagicMock()
-            result = self.jenkins_build_manager._create_downstream_builds(
-                ci_jenkins_build, ci_extractor_build)
+            util_jenkins_build.create_downstream_builds(
+                ci_jenkins_build,
+                ci_extractor_build,
+            )
         ci_jenkins_build_downstream_builds.add.assert_called_with(
-                "fake_downstream_build")
+            "fake_downstream_build",
+        )
         ci_jenkins_build_save.assert_called()
 
-
-    @skip
     def test_jenkins_job_create(self):
-        get_downstream_builds_from_build = MagicMock(return_value=[extractor.BuildUrl(
-            url='http://s-jenkins:8080/job/mir-raring-i386-autolanding/3',
-            number=3)])
+        get_downstream_builds_from_build = MagicMock(
+            return_value=[
+                extractor.BuildUrl(
+                    url='http://s-jenkins:8080/job/mir-raring-i386-autolanding/3',
+                    number=3,
+                ),
+            ],
+        )
         extractor_build = MagicMock()
         extractor_build.job_name = 'mir-raring-i386-autolanding'
         extractor_build.number = 3
@@ -204,71 +259,12 @@
                 patch('ci.models.JenkinsBuild.objects.get', jenkins_build_get), \
                 patch.object(ci_jenkins_build, 'save') as ci_jenkins_build_save, \
                 patch.object(ci_jenkins_build, 'downstream_builds') as ci_jenkins_build_downstream_builds, \
-                patch('ci.util.jenkins.create_jenkins_job_from_name') as jenkins_job_create_from_name:
+                patch('ci.util.jenkins_job.create_jenkins_job_from_name') as jenkins_job_create_from_name:
             ci_jenkins_build_downstream_builds.add = MagicMock()
-            result = self.jenkins_build_manager._create_downstream_builds(
+            result = util_jenkins_build.create_downstream_builds(
                 ci_jenkins_build, ci_extractor_build)
         jenkins_job_create_from_name.assert_called_with(
             'http://s-jenkins:8080', name='mir-raring-i386-autolanding')
         ci_jenkins_build_downstream_builds.add.assert_called_with(
                 "fake_downstream_build")
         ci_jenkins_build_save.assert_called()
-
-
-    @skip
-    def test_jenkins_build_create(self):
-        get_downstream_builds_from_build = MagicMock(return_value=[extractor.BuildUrl(
-            url='http://s-jenkins:8080/job/mir-raring-i386-autolanding/3',
-            number=3)])
-        extractor_build = MagicMock()
-        extractor_build.job_name = 'mir-raring-i386-autolanding'
-        extractor_build.number = 3
-        jenkins_build_mock = MagicMock(return_value=extractor_build)
-        jenkins_job_get = MagicMock(return_value=self.dummy_jenkins_job)
-        jenkins_build_get = MagicMock(side_effect=JenkinsBuild.DoesNotExist)
-        jenkins_build_create_from_name_and_number = MagicMock(return_value='fake_jenkins_build')
-        ci_jenkins_build = MagicMock()
-        ci_extractor_build = MagicMock()
-        ci_extractor_build.url = 'http://s-jenkins:8080/job/fake_jenkins_build/3'
-        with patch('ci.util.extractor.get_downstream_builds_from_build', get_downstream_builds_from_build), \
-                patch('ci.util.extractor.JenkinsBuild', jenkins_build_mock), \
-                patch('ci.models.JenkinsJob.objects.get', jenkins_job_get), \
-                patch('ci.models.JenkinsBuild.objects.get', jenkins_build_get), \
-                patch.object(ci_jenkins_build, 'save') as ci_jenkins_build_save, \
-                patch.object(ci_jenkins_build, 'downstream_builds') as ci_jenkins_build_downstream_builds, \
-                patch('ci.models.JenkinsBuild.objects.create_from_name_and_number',
-                      jenkins_build_create_from_name_and_number):
-            ci_jenkins_build_downstream_builds.add = MagicMock()
-            result = self.jenkins_build_manager._create_downstream_builds(
-                ci_jenkins_build, ci_extractor_build)
-        jenkins_build_create_from_name_and_number.assert_called_with(
-            'http://s-jenkins:8080', 'mir-raring-i386-autolanding', 3)
-        ci_jenkins_build_downstream_builds.add.assert_called_with(
-                "fake_jenkins_build")
-        ci_jenkins_build_save.assert_called()
-
-
-class TestCreateFromNameAndNumber(JenkinsBuildManagerTestCase):
-
-    @skip
-    def test_vanilla(self):
-        jenkins_build_url = 'http://fake.jenkins.build.url/uhhuh/'
-        jenkins_job_get = MagicMock(return_value=self.dummy_jenkins_job)
-        extractor_get_build_url = MagicMock(return_value=jenkins_build_url)
-        with patch('ci.models.JenkinsJob.objects.get', jenkins_job_get), \
-                patch('ci.models.JenkinsBuildManager.create_from_url') as jenkins_build_manager_create_from_url, \
-                patch('ci.util.extractor.get_build_url',
-                      extractor_get_build_url):
-            result = self.jenkins_build_manager.create_from_name_and_number(
-                'http://s-jenkins:8080', 'louis-autolanding', 14)
-        jenkins_build_manager_create_from_url.assert_called_with(
-            jenkins_build_url, self.dummy_jenkins_job)
-
-
-    @skip
-    def test_blacklisted(self):
-        blacklist_jobs = ['louis',]
-        with patch('ci.models.BLACKLIST_JOBS', blacklist_jobs):
-            result = self.jenkins_build_manager.create_from_name_and_number(
-                'http://s-jenkins:8080', 'louis-autolanding', 14)
-        self.assertIsNone(result)

=== removed file 'tests/unit/test_jenkins_utilities.py'
--- tests/unit/test_jenkins_utilities.py	2013-07-16 17:11:09 +0000
+++ tests/unit/test_jenkins_utilities.py	1970-01-01 00:00:00 +0000
@@ -1,74 +0,0 @@
-# QA Dashboard
-# Copyright 2012-2013 Canonical Ltd.
-
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU Affero General Public License version 3, as
-# published by the Free Software Foundation.
-
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranties of
-# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-# PURPOSE.  See the GNU Affero General Public License for more details.
-
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-from mock import call, MagicMock, patch
-import json
-import os.path
-import unittest
-from ci.util.extractor import get_json_from_url, get_text_from_url
-
-"""Tests for module JenkinsUtilites"""
-
-DATA_PATH = "tests/data"
-
-
-class JenkinsUtilitiesTestCase(unittest.TestCase):
-    """Unit tests for JenkinsUtilities methods"""
-
-    def setUp(self):
-        self.get_mock = MagicMock(return_value=type('fake_request',
-                                                    (object,),
-                                                    {'status_code': 200,
-                                                     'text': '{"value": 42}'}))
-
-    def test_get_json_from_url(self):
-        url = "http://localhost/foo/"
-        data = None
-        with patch('requests.get', self.get_mock):
-            data = get_json_from_url(url)
-        self.assertEqual(data['value'], 42)
-        self.assertEqual(self.get_mock.call_args, call(url + "/api/json"))
-
-    def test_get_json_from_url_none(self):
-        url = "http://localhost/foo/"
-        mock = MagicMock(return_value=type('fake_request',
-                                           (object,),
-                                           {'status_code': 404,
-                                            'text': 'null'}))
-        with patch('requests.get', mock):
-            with self.assertRaises(EnvironmentError) as err:
-                get_json_from_url(url)
-            self.assertEqual("No json data at http://localhost/foo//api/json",
-                             "%s" % (err.exception))
-
-    def test_get_text_from_url(self):
-        url = "http://localhost/foo/"
-        data = None
-        with patch('requests.get', self.get_mock):
-            data = get_text_from_url(url)
-        self.assertEqual(data, '{"value": 42}')
-        self.assertEqual(self.get_mock.call_args, call(url))
-
-    def test_get_text_from_url_none(self):
-        url = "http://localhost/foo/"
-        mock = MagicMock(return_value=type('fake_request',
-                                           (object,),
-                                           {'status_code': 404,
-                                            'text': 'null'}))
-        with patch('requests.get', mock):
-            with self.assertRaises(EnvironmentError) as err:
-                get_text_from_url(url)
-            self.assertEqual("No data at http://localhost/foo/",
-                             "%s" % (err.exception))

=== modified file 'tests/unit/test_launchpad_project_import.py'
--- tests/unit/test_launchpad_project_import.py	2013-07-16 17:11:09 +0000
+++ tests/unit/test_launchpad_project_import.py	2013-07-26 16:05:52 +0000
@@ -13,8 +13,6 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-
-from unittest import skip
 from mock import MagicMock, patch, call
 from django.test import TestCase
 from ci.models import LaunchpadProject
@@ -31,23 +29,23 @@
         self.logger_patch.stop()
 
     # TODO restore this when we're really dealing with Launchpad
-    @skip
     def test_vanilla(self):
         dummy_launchpad_project_name = 'fake-ci-project'
         dummy_launchpad_project_url = 'http://this.is.an.official.lp.url/really/'
+        launchpad_project_get_or_create = MagicMock(
+            return_value=(MagicMock(), False))
         # TODO this could be miraculously clearer :)
         lp = MagicMock(
             return_value=MagicMock(
                 projects={dummy_launchpad_project_name:
                               MagicMock(web_link=dummy_launchpad_project_url)}))
         with patch('launchpadlib.launchpad.Launchpad.login_with', lp), \
-            patch('ci.models.LaunchpadProject.objects.create') as launchpad_project_create:
+                patch('ci.models.LaunchpadProject.objects.get_or_create',
+                      launchpad_project_get_or_create):
             result = util_launchpad_project.create_launchpad_project_from_name(
                 name=dummy_launchpad_project_name)
-        launchpad_project_create.assert_called_with(
-            name=dummy_launchpad_project_name,
-            url=dummy_launchpad_project_url)
-        # TODO need to actually check for the url attribute
+        launchpad_project_get_or_create.assert_called_with(
+            name=dummy_launchpad_project_name)
 
     def test_naming(self):
         launchpad_project_get_or_create = MagicMock(