Merge lp:~matsubara/maas/packaging.precise.sru into lp:~maas-maintainers/maas/packaging.precise.sru

[Diogo Matsubara]

removes the debian/tests dir and removes the XS-Testsuite header

This branch removes the debian/tests dir as we're maintaining the test in its own branch. Also removes the XS-Testsuite header from the package so the ubuntu qa scripts won't pick it up and automatically create jenkins jobs for the package.

[Raphaël Badin (rvb)]

review: Approve

[Raphaël Badin (rvb)]

IIRC there is no tarmac job for lp:~maas-maintainers/maas/packaging.precise.sru so you need to merge this manually.

=== modified file 'debian/control'
--- debian/control	2013-02-02 00:25:55 +0000
+++ debian/control	2013-02-15 12:00:39 +0000
@@ -10,7 +10,6 @@
                python-django
 Standards-Version: 3.9.3
 X-Python-Version: >= 2.7
-XS-Testsuite: autopkgtest
 Homepage: https://launchpad.net/maas
 
 Package: maas
 
=== removed directory 'debian/tests'
=== removed file 'debian/tests/control'
--- debian/tests/control	2012-09-10 19:28:15 +0000
+++ debian/tests/control	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-Tests: maas-package-test
-Depends: @, python-nose, xvfb, python-pip
 
=== removed file 'debian/tests/maas-integration.py'
--- debian/tests/maas-integration.py	2012-09-20 02:22:33 +0000
+++ debian/tests/maas-integration.py	1970-01-01 00:00:00 +0000
@@ -1,72 +0,0 @@
-# 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()
 
=== removed file 'debian/tests/maas-package-test'
--- debian/tests/maas-package-test	2012-09-20 02:22:33 +0000
+++ debian/tests/maas-package-test	1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-#!/bin/sh
-set -e -u
-exec 2>&1
-pip install sst
-nosetests debian/tests/maas-integration.py