Merge lp:~smoser/maas/rename-patch into lp:~maas-maintainers/maas/packaging

[Scott Moser]

Fix daily package build.

Fix daily package build.

In a previous commit (revno 86), I had moved tests/maas-integration.py out of the
tree and into a patch, as debian packaging should not modify files outside of
debian/ directly (debuild --source-option=--abort-on-upstream-changes).

However, apparently that makes the daily builder hit a bug [1,2] as discussed at [3].

So, for now I'm putting this back in as it was, as that previously built.

--
[1] https://code.launchpad.net/~maas-maintainers/+archive/dailybuilds/+recipebuild/307084
[2] https://launchpadlibrarian.net/115990138/buildlog.txt.gz
[3] http://irclogs.ubuntu.com/2012/09/14/%23bzr.html

[Andres Rodriguez (andreserl)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-09-14 17:55:18 +0000
+++ debian/changelog	2012-09-14 20:02:23 +0000
@@ -1,4 +1,4 @@
-maas (0.1+bzr1001+dfsg-0ubuntu3) UNRELEASED; urgency=low
+maas (0.1+bzr1002+dfsg-0ubuntu3) UNRELEASED; urgency=low
 
   [ Scott Moser ]
   * debian/maas-dhcp.{install,apparmor,postrm} install apparmor profile into
 
=== removed file 'debian/patches/04-add-maas-integration.py'
--- debian/patches/04-add-maas-integration.py	2012-09-14 18:13:33 +0000
+++ debian/patches/04-add-maas-integration.py	1970-01-01 00:00:00 +0000
@@ -1,75 +0,0 @@
---- /dev/null
-+++ b/tests/maas-integration.py
-@@ -0,0 +1,72 @@
-+# TODO
-+#  - send ipmi commands to turn on/off nodes
-+#  - run import pxe files
-+#  - check node states once they're on/off
-+#  - check node state changes (declared -> commissionig -> ready)
-+import os
-+from subprocess import check_output
-+import sys
-+from unittest import TestCase
-+
-+from pyvirtualdisplay import Display
-+from sst.actions import (
-+    assert_url, assert_text_contains, assert_title_contains, click_button,
-+    get_element, go_to, write_textfield)
-+
-+
-+sys.path.insert(0, "/usr/share/maas")
-+os.environ['DJANGO_SETTINGS_MODULE'] = 'maas.settings'
-+from maasserver.models import User
-+
-+MAAS_URL = "http://10.98.0.13/MAAS"
-+ADMIN_USER = "admin"
-+PASSWORD = "test"
-+
-+
-+class TestMAASIntegration(TestCase):
-+
-+    def setUp(self):
-+        self.display = Display(visible=0, size=(1280, 1024))
-+        self.display.start()
-+
-+    def tearDown(self):
-+        self.display.stop()
-+
-+    def createadmin(self):
-+        """Run sudo maas createsuperuser."""
-+        cmd_output = check_output(
-+            ["sudo", "maas", "createsuperuser", "--username=%s" % ADMIN_USER,
-+            "--email=[e-mail]", "--noinput"])
-+        ## Set password for admin user.
-+        try:
-+            admin = User.objects.get(username=ADMIN_USER)
-+        except User.DoesNotExist:
-+            admin = User(username=ADMIN_USER)
-+        admin.set_password(PASSWORD)
-+        admin.save()
-+        return cmd_output
-+
-+    def installation(self):
-+        # Check the installation worked.
-+        go_to(MAAS_URL)
-+        assert_text_contains(
-+            get_element(tag="body"), "No admin user has been created yet")
-+
-+    def createadmin_and_login(self):
-+        ## Creates the admin user.
-+        output = self.createadmin()
-+        self.assertEqual(output, 'Superuser created successfully.')
-+        ## Login with the newly created admin user
-+        go_to(MAAS_URL)
-+        assert_text_contains(
-+            get_element(tag="body"), "Login to lenovo-RD230-01 MAAS")
-+        write_textfield("id_username", ADMIN_USER)
-+        write_textfield("id_password", PASSWORD)
-+        click_button("Login")
-+        assert_url("MAAS/")
-+        assert_title_contains("Dashboard")
-+
-+    def test_integration(self):
-+        # Run the integration tests in order.
-+        self.installation()
-+        self.createadmin_and_login()
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2012-09-14 18:13:33 +0000
+++ debian/patches/series	2012-09-14 20:02:23 +0000
@@ -1,4 +1,3 @@
 01-fix-database-settings.patch
 02-pserv-config.patch
 03-txlongpoll-config.patch
-04-add-maas-integration.py
 
=== added directory 'tests'
=== added file 'tests/maas-integration.py'
--- tests/maas-integration.py	1970-01-01 00:00:00 +0000
+++ tests/maas-integration.py	2012-09-14 20:02:23 +0000
@@ -0,0 +1,72 @@
+# TODO
+#  - send ipmi commands to turn on/off nodes
+#  - run import pxe files
+#  - check node states once they're on/off
+#  - check node state changes (declared -> commissionig -> ready)
+import os
+from subprocess import check_output
+import sys
+from unittest import TestCase
+
+from pyvirtualdisplay import Display
+from sst.actions import (
+    assert_url, assert_text_contains, assert_title_contains, click_button,
+    get_element, go_to, write_textfield)
+
+
+sys.path.insert(0, "/usr/share/maas")
+os.environ['DJANGO_SETTINGS_MODULE'] = 'maas.settings'
+from maasserver.models import User
+
+MAAS_URL = "http://10.98.0.13/MAAS"
+ADMIN_USER = "admin"
+PASSWORD = "test"
+
+
+class TestMAASIntegration(TestCase):
+
+    def setUp(self):
+        self.display = Display(visible=0, size=(1280, 1024))
+        self.display.start()
+
+    def tearDown(self):
+        self.display.stop()
+
+    def createadmin(self):
+        """Run sudo maas createsuperuser."""
+        cmd_output = check_output(
+            ["sudo", "maas", "createsuperuser", "--username=%s" % ADMIN_USER,
+            "--email=[e-mail]", "--noinput"])
+        ## Set password for admin user.
+        try:
+            admin = User.objects.get(username=ADMIN_USER)
+        except User.DoesNotExist:
+            admin = User(username=ADMIN_USER)
+        admin.set_password(PASSWORD)
+        admin.save()
+        return cmd_output
+
+    def installation(self):
+        # Check the installation worked.
+        go_to(MAAS_URL)
+        assert_text_contains(
+            get_element(tag="body"), "No admin user has been created yet")
+
+    def createadmin_and_login(self):
+        ## Creates the admin user.
+        output = self.createadmin()
+        self.assertEqual(output, 'Superuser created successfully.')
+        ## Login with the newly created admin user
+        go_to(MAAS_URL)
+        assert_text_contains(
+            get_element(tag="body"), "Login to lenovo-RD230-01 MAAS")
+        write_textfield("id_username", ADMIN_USER)
+        write_textfield("id_password", PASSWORD)
+        click_button("Login")
+        assert_url("MAAS/")
+        assert_title_contains("Dashboard")
+
+    def test_integration(self):
+        # Run the integration tests in order.
+        self.installation()
+        self.createadmin_and_login()