Gavin Panella has proposed merging
lp:~allenap/maas/consolidate-namespace-clientlib into lp:maas with
lp:~allenap/maas/consolidate-namespace-testing as a prerequisite.
Requested reviews:
Launchpad code reviewers (launchpad-reviewers)
For more details, see:
https://code.launchpad.net/~allenap/maas/consolidate-namespace-clientlib/+merge/108017
Moves the apiclient package to maas.clientlib, as discussed in
https://code.launchpad.net/~jtv/maas/oauth-client-library/+merge/107056/comments/230782.
A separate bin/test.clientlib script was needed because otherwise it wasn't
being tested. I'm hopeful that this proliferation of test scripts can be
reverted one day, so consider this a transitional phase.
--
https://code.launchpad.net/~allenap/maas/consolidate-namespace-clientlib/+merge/108017
Your team Launchpad code reviewers is requested to review the proposed merge of
lp:~allenap/maas/consolidate-namespace-clientlib into lp:maas.
=== modified file 'Makefile'
--- Makefile 2012-05-30 17:05:23 +0000
+++ Makefile 2012-05-30 17:05:23 +0000
@@ -17,6 +17,7 @@
build: \
bin/buildout \
bin/database \
+ bin/test.clientlib \
bin/maas bin/test.maas \
bin/test.mserv bin/test.testing \
bin/twistd.pserv bin/test.pserv \
@@ -34,6 +35,10 @@
bin/buildout install database
@touch --no-create $@
+bin/test.clientlib: bin/buildout buildout.cfg versions.cfg setup.py
+ bin/buildout install clientlib-test
+ @touch --no-create $@
+
bin/maas: bin/buildout buildout.cfg versions.cfg setup.py $(js_enums)
bin/buildout install maas
@touch --no-create $@
@@ -74,8 +79,9 @@
bin/buildout install repl
@touch --no-create bin/py bin/ipy
-test: bin/test.maas bin/test.mserv bin/test.testing
-test: bin/test.pserv $(js_enums)
+test: bin/test.clientlib bin/test.maas bin/test.mserv
+test: bin/test.testing bin/test.pserv $(js_enums)
+ bin/test.clientlib
bin/test.maas
bin/test.mserv
bin/test.testing
=== modified file 'buildout.cfg'
--- buildout.cfg 2012-05-30 17:05:23 +0000
+++ buildout.cfg 2012-05-30 17:05:23 +0000
@@ -1,5 +1,6 @@
[buildout]
parts =
+ clientlib-test
flake8
maas
maas-test
@@ -131,6 +132,18 @@
extra-paths =
${maas:extra-paths}
+[clientlib-test]
+recipe = zc.recipe.egg
+eggs =
+ ${common:test-eggs}
+entry-points =
+ test.clientlib=nose.core:TestProgram
+initialization =
+ sys.argv[1:1] = ["--where=src/maas/clientlib"]
+scripts = test.clientlib
+extra-paths =
+ ${maas:extra-paths}
+
[mserv-test]
recipe = zc.recipe.egg
eggs =
=== renamed directory 'src/apiclient' => 'src/maas/clientlib'
=== modified file 'src/maas/clientlib/maas_client.py'
--- src/apiclient/maas_client.py 2012-05-24 04:03:05 +0000
+++ src/maas/clientlib/maas_client.py 2012-05-30 17:05:23 +0000
@@ -23,7 +23,7 @@
urlparse,
)
-from apiclient.multipart import encode_multipart_data
+from maas.clientlib.multipart import encode_multipart_data
import oauth.oauth as oauth
=== modified file 'src/maas/clientlib/tests/test_maas_client.py'
--- src/apiclient/tests/test_maas_client.py 2012-05-30 17:05:23 +0000
+++ src/maas/clientlib/tests/test_maas_client.py 2012-05-30 17:05:23 +0000
@@ -20,7 +20,7 @@
urlparse,
)
-from apiclient.maas_client import (
+from maas.clientlib.maas_client import (
_ascii_url,
MAASClient,
MAASDispatcher,
=== modified file 'src/maas/clientlib/tests/test_multipart.py'
--- src/apiclient/tests/test_multipart.py 2012-05-30 17:05:23 +0000
+++ src/maas/clientlib/tests/test_multipart.py 2012-05-30 17:05:23 +0000
@@ -17,7 +17,7 @@
import re
from textwrap import dedent
-from apiclient.multipart import (
+from maas.clientlib.multipart import (
encode_field,
encode_file,
encode_multipart_data,
_______________________________________________
Mailing list: https://launchpad.net/~launchpad-reviewers
Post to : launchpad-reviewers@lists.launchpad.net
Unsubscribe : https://launchpad.net/~launchpad-reviewers
More help : https://help.launchpad.net/ListHelp
