MAAS

Merge ~mpontillo/maas:fix-maasserver-tests-test-js into maas:master

  1. Git
  2. lp:~mpontillo/maas
  3. fix-maasserver-tests-test-js
  4. Merge into master
Proposed by Mike Pontillo
Status: Merged
Approved by: Mike Pontillo
Approved revision: f7ad0a6f177d8fa20b783b16bd512140fa7567e3
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~mpontillo/maas:fix-maasserver-tests-test-js
Merge into: maas:master
Diff against target: 74 lines (+8/-8)
5 files modified
src/maasserver/static/js/tests/test_enums.html (+1/-1)
src/maasserver/static/js/tests/test_os_distro_select.html (+2/-2)
src/maasserver/static/js/tests/test_prefs.html (+2/-2)
src/maasserver/static/js/tests/test_reveal.html (+1/-1)
src/maasserver/static/js/tests/test_shortpoll.html (+2/-2)
Reviewer Review Type Date Requested Status
Blake Rouse (community) Approve
Review via email: mp+341233@code.launchpad.net

Commit message

Fix maasserver.tests.test_js.

To post a comment you must log in.
Revision history for this message
Blake Rouse (blake-rouse) wrote :

Looks good.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/src/maasserver/static/js/tests/test_enums.html b/src/maasserver/static/js/tests/test_enums.html
index 4ed6c36..b9dc4fc 100644
--- a/src/maasserver/static/js/tests/test_enums.html
+++ b/src/maasserver/static/js/tests/test_enums.html
@@ -10,7 +10,7 @@
10 <script type="text/javascript" src="../testing/testing.js"></script>10 <script type="text/javascript" src="../testing/testing.js"></script>
11 <script type="text/javascript" src="../node.js"></script>11 <script type="text/javascript" src="../node.js"></script>
12 <!-- The module under test -->12 <!-- The module under test -->
13 <script type="text/javascript" src="../enums.js"></script>13 <script type="text/javascript" src="../yui/enums.js"></script>
14 <!-- The test suite -->14 <!-- The test suite -->
15 <script type="text/javascript" src="test_enums.js"></script>15 <script type="text/javascript" src="test_enums.js"></script>
16 <script type="text/javascript">16 <script type="text/javascript">
diff --git a/src/maasserver/static/js/tests/test_os_distro_select.html b/src/maasserver/static/js/tests/test_os_distro_select.html
index eff1bb1..f87a3f8 100644
--- a/src/maasserver/static/js/tests/test_os_distro_select.html
+++ b/src/maasserver/static/js/tests/test_os_distro_select.html
@@ -8,9 +8,9 @@
8 <script type="text/javascript" src="/usr/share/javascript/yui3/yui/yui.js"></script>8 <script type="text/javascript" src="/usr/share/javascript/yui3/yui/yui.js"></script>
9 <script type="text/javascript" src="../testing/testrunner.js"></script>9 <script type="text/javascript" src="../testing/testrunner.js"></script>
10 <script type="text/javascript" src="../testing/testing.js"></script>10 <script type="text/javascript" src="../testing/testing.js"></script>
11 <script type="text/javascript" src="../io.js"></script>11 <script type="text/javascript" src="../yui/io.js"></script>
12 <!-- The module under test -->12 <!-- The module under test -->
13 <script type="text/javascript" src="../os_distro_select.js"></script>13 <script type="text/javascript" src="../yui/os_distro_select.js"></script>
14 <!-- The test suite -->14 <!-- The test suite -->
15 <script type="text/javascript" src="test_os_distro_select.js"></script>15 <script type="text/javascript" src="test_os_distro_select.js"></script>
16 </head>16 </head>
diff --git a/src/maasserver/static/js/tests/test_prefs.html b/src/maasserver/static/js/tests/test_prefs.html
index 63bbd33..989e9df 100644
--- a/src/maasserver/static/js/tests/test_prefs.html
+++ b/src/maasserver/static/js/tests/test_prefs.html
@@ -8,9 +8,9 @@
8 <script type="text/javascript" src="/usr/share/javascript/yui3/yui/yui.js"></script>8 <script type="text/javascript" src="/usr/share/javascript/yui3/yui/yui.js"></script>
9 <script type="text/javascript" src="../testing/testrunner.js"></script>9 <script type="text/javascript" src="../testing/testrunner.js"></script>
10 <script type="text/javascript" src="../testing/testing.js"></script>10 <script type="text/javascript" src="../testing/testing.js"></script>
11 <script type="text/javascript" src="../io.js"></script>11 <script type="text/javascript" src="../yui/io.js"></script>
12 <!-- The module under test -->12 <!-- The module under test -->
13 <script type="text/javascript" src="../prefs.js"></script>13 <script type="text/javascript" src="../yui/prefs.js"></script>
14 <!-- The test suite -->14 <!-- The test suite -->
15 <script type="text/javascript" src="test_prefs.js"></script>15 <script type="text/javascript" src="test_prefs.js"></script>
16 <script type="text/javascript">16 <script type="text/javascript">
diff --git a/src/maasserver/static/js/tests/test_reveal.html b/src/maasserver/static/js/tests/test_reveal.html
index 6847cb7..26a40b1 100644
--- a/src/maasserver/static/js/tests/test_reveal.html
+++ b/src/maasserver/static/js/tests/test_reveal.html
@@ -9,7 +9,7 @@
9 <script type="text/javascript" src="../testing/testrunner.js"></script>9 <script type="text/javascript" src="../testing/testrunner.js"></script>
10 <script type="text/javascript" src="../testing/testing.js"></script>10 <script type="text/javascript" src="../testing/testing.js"></script>
11 <!-- The module under test -->11 <!-- The module under test -->
12 <script type="text/javascript" src="../reveal.js"></script>12 <script type="text/javascript" src="../yui/reveal.js"></script>
13 <!-- The test suite -->13 <!-- The test suite -->
14 <script type="text/javascript" src="test_reveal.js"></script>14 <script type="text/javascript" src="test_reveal.js"></script>
15 </head>15 </head>
diff --git a/src/maasserver/static/js/tests/test_shortpoll.html b/src/maasserver/static/js/tests/test_shortpoll.html
index c6399bc..f0bffc5 100644
--- a/src/maasserver/static/js/tests/test_shortpoll.html
+++ b/src/maasserver/static/js/tests/test_shortpoll.html
@@ -8,9 +8,9 @@
8 <script type="text/javascript" src="/usr/share/javascript/yui3/yui/yui.js"></script>8 <script type="text/javascript" src="/usr/share/javascript/yui3/yui/yui.js"></script>
9 <script type="text/javascript" src="../testing/testrunner.js"></script>9 <script type="text/javascript" src="../testing/testrunner.js"></script>
10 <script type="text/javascript" src="../testing/testing.js"></script>10 <script type="text/javascript" src="../testing/testing.js"></script>
11 <script type="text/javascript" src="../io.js"></script>11 <script type="text/javascript" src="../yui/io.js"></script>
12 <!-- The module under test -->12 <!-- The module under test -->
13 <script type="text/javascript" src="../shortpoll.js"></script>13 <script type="text/javascript" src="../yui/shortpoll.js"></script>
14 <!-- The test suite -->14 <!-- The test suite -->
15 <script type="text/javascript" src="test_shortpoll.js"></script>15 <script type="text/javascript" src="test_shortpoll.js"></script>
16 </head>16 </head>

Subscribers

People subscribed via source and target branches