Make tests more reliable

Makefile

 # Makefile debugging hack: uncomment the two lines below and make will tell you
 # more about what is happening.  The output generated is of the form
 # "FILE:LINE [TARGET (DEPENDENCIES) (NEWER)]" where DEPENDENCIES are all the
 # things TARGET depends on and NEWER are all the files that are newer than
 # TARGET.  DEPENDENCIES will be colored green and NEWER will be blue.
 #
 #OLD_SHELL := $(SHELL)
 #SHELL = $(warning [$@ ($^) ($?) ])$(OLD_SHELL)
 
 # Build a target for JavaScript files.  The find command excludes directories
@@ skipping 104 matching lines @@
 endif
 endif
 endif
 ### End of release-specific variables ###
 TEMPLATE_TARGETS=$(shell find app/templates -type f ! -name '.*' ! -name '*.swp' ! -name '*~' ! -name '\#*' -print)
 
 SPRITE_SOURCE_FILES=$(shell find app/assets/images -type f ! -name '.*' ! -name '*.swp' ! -name '*~' ! -name '\#*' -print)
 SPRITE_GENERATED_FILES=build-shared/juju-ui/assets/sprite.css \
         build-shared/juju-ui/assets/sprite.png
 NON_SPRITE_IMAGES=build-shared/juju-ui/assets/images
-BUILD_FILES=build-shared/juju-ui/assets/app.js \
+BUILD_FILES=build-shared/juju-ui/assets/modules.js \
         build-shared/juju-ui/assets/all-yui.js \
         build-shared/juju-ui/assets/combined-css/all-static.css
 JAVASCRIPT_LIBRARIES=app/assets/javascripts/d3.v2.js \
         app/assets/javascripts/d3.v2.min.js app/assets/javascripts/yui
 DATE=$(shell date -u)
 APPCACHE=build-shared/juju-ui/assets/manifest.appcache
 
 # Some environments, notably sudo, do not populate the default PWD environment
 # variable, which is used to set $(PWD).  Worse, in some situations, such as
 # using make -C [directory], $(PWD) is set to a value we don't want: the
@@ skipping 11 matching lines @@
         @echo "[no target] or build: build the debug and production environments"
         @echo "devel: run the development environment (dynamic templates/CSS)"
         @echo "debug: run the debugging environment (static templates/CSS)"
         @echo "prod: run the production environment (aggregated, compressed files)"
         @echo "clean: remove the generated build directories"
         @echo "clean-all: remove build, deps and doc directories"
         @echo "test-debug: run tests on the cli from the debug environment"
         @echo "test-prod: run tests on the cli from the production environment"
         @echo "test-misc: run tests of project infrastructure bits"
         @echo "test-server: run tests in the browser from the debug environment"
+        @echo "test-prod-server: run tests in the browser from the prod environment"
         @echo "prep: beautify and lint the source"
         @echo "docs: generate project and code documentation"
         @echo "view-docs: generate both doc sets and view them in the browser"
         @echo "help: this description"
         @echo "Other targets are available, see the Makefile."
 
 build-shared/juju-ui/templates.js: $(TEMPLATE_TARGETS) bin/generateTemplates
         mkdir -p build-shared/juju-ui/assets
         bin/generateTemplates
 
@@ skipping 116 matching lines @@
         ln -sf "$(PWD)/node_modules/yui/slider-base/assets/skins/sam/rail-x.png" \
                 build-shared/juju-ui/assets/combined-css/rail-x.png
         bin/merge-files
         mv *.js.map build-shared/juju-ui/assets/
 
 build-files: $(BUILD_FILES)
 
 # This leaves out all of the individual YUI assets, because we can't have them
 # the first time the Makefile is run in a clean tree.
 shared-link-files-list=build-$(1)/juju-ui/assets/combined-css \
-        build-$(1)/favicon.ico build-$(1)/index.html \
-        build-$(1)/juju-ui/assets/config.js build-$(1)/juju-ui/assets/modules.js \
-        build-$(1)/juju-ui/assets/images build-$(1)/juju-ui/assets/svgs \
-        build-$(1)/juju-ui/assets/app.js build-$(1)/juju-ui/version.js \
+        build-$(1)/favicon.ico \
+        build-$(1)/index.html \
+        build-$(1)/juju-ui/assets/config.js \
+        build-$(1)/juju-ui/assets/modules.js \
+        build-$(1)/juju-ui/assets/images \
+        build-$(1)/juju-ui/assets/svgs \
+        build-$(1)/juju-ui/version.js \
         build-$(1)/juju-ui/assets/manifest.appcache \
         build-$(1)/juju-ui/assets/combined-css/all-static.css \
         build-$(1)/juju-ui/assets/juju-gui.css \
         build-$(1)/juju-ui/assets/sprite.css \
         build-$(1)/juju-ui/assets/sprite.png \
         build-$(1)/juju-ui/assets/combined-css/rail-x.png \
         build-$(1)/juju-ui/assets/all-yui.js
 
 LINK_DEBUG_FILES=$(call shared-link-files-list,debug) \
-        build-debug/juju-ui/app.js build-debug/juju-ui/models \
-        build-debug/juju-ui/store build-debug/juju-ui/subapps \
+        build-debug/juju-ui/app.js \
+        build-debug/juju-ui/models \
+        build-debug/juju-ui/store \
+        build-debug/juju-ui/subapps \
         build-debug/juju-ui/views \
-        build-debug/juju-ui/widgets build-debug/juju-ui/assets/javascripts \
+        build-debug/juju-ui/widgets \
+        build-debug/juju-ui/assets/javascripts \
         build-debug/juju-ui/templates.js
 
 LINK_PROD_FILES=$(call shared-link-files-list,prod)
 
 # These are shared instructions between link-debug-files and link-prod-files.
 define link-files
         mkdir -p build-$(1)/juju-ui/assets/combined-css
         ln -sf "$(PWD)/app/favicon.ico" build-$(1)/
         ln -sf "$(PWD)/app/index.html" build-$(1)/
         ln -sf "$(PWD)/app/config-$(1).js" build-$(1)/juju-ui/assets/config.js
-        ln -sf "$(PWD)/app/modules-$(1).js" build-$(1)/juju-ui/assets/modules.js
         ln -sf "$(PWD)/app/assets/images" build-$(1)/juju-ui/assets/
         ln -sf "$(PWD)/app/assets/svgs" build-$(1)/juju-ui/assets/
         ln -sf "$(PWD)/app/assets/javascripts" build-$(1)/juju-ui/assets/
         ln -sf "$(PWD)/build-shared/juju-ui/version.js" build-$(1)/juju-ui/
-        ln -sf "$(PWD)/build-shared/juju-ui/assets/app.js" build-$(1)/juju-ui/assets/
         ln -sf "$(PWD)/build-shared/juju-ui/assets/manifest.appcache" \
                 build-$(1)/juju-ui/assets/
         ln -sf "$(PWD)/build-shared/juju-ui/assets/combined-css/all-static.css" \
                 build-$(1)/juju-ui/assets/combined-css/
         ln -sf "$(PWD)/build-shared/juju-ui/assets/combined-css/rail-x.png" \
                 build-$(1)/juju-ui/assets/combined-css/
         ln -sf "$(PWD)/build-shared/juju-ui/assets/juju-gui.css" build-$(1)/juju-ui/assets/
         ln -sf "$(PWD)/build-shared/juju-ui/assets/sprite.css" build-$(1)/juju-ui/assets/
         ln -sf "$(PWD)/build-shared/juju-ui/assets/sprite.png" build-$(1)/juju-ui/assets/
         ln -sf "$(PWD)/node_modules/yui/event-simulate/event-simulate.js" \
@@ skipping 16 matching lines @@
         $(call link-files,debug)
         ln -sf "$(PWD)/app/app.js" build-debug/juju-ui/
         ln -sf "$(PWD)/app/models" build-debug/juju-ui/
         ln -sf "$(PWD)/app/store" build-debug/juju-ui/
         ln -sf "$(PWD)/app/subapps" build-debug/juju-ui/
         ln -sf "$(PWD)/app/views" build-debug/juju-ui/
         ln -sf "$(PWD)/app/widgets" build-debug/juju-ui/
         ln -sf "$(PWD)/app/assets/javascripts/yui/yui/yui-debug.js" \
                 build-debug/juju-ui/assets/all-yui.js
         ln -sf "$(PWD)/build-shared/juju-ui/templates.js" build-debug/juju-ui/
+        ln -sf "$(PWD)/app/modules-debug.js" build-debug/juju-ui/assets/modules.js
 
 $(LINK_PROD_FILES):
         $(call link-files,prod)
         ln -sf "$(PWD)/build-shared/juju-ui/assets/all-yui.js" build-prod/juju-ui/assets/
         ln -sf "$(PWD)"/build-shared/juju-ui/assets/*.js.map build-prod/juju-ui/assets/
         # Link in the application source code so source maps work.
         mkdir -p $(PWD)/build-prod/juju-ui/assets/source
         ln -s $(PWD)/app $(PWD)/build-prod/juju-ui/assets/source
         ln -s $(PWD)/node_modules $(PWD)/build-prod/juju-ui/assets/source
+        ln -sf "$(PWD)/build-shared/juju-ui/assets/modules.js" build-prod/juju-ui/assets/modules.js
 
 prep: beautify lint
 
 test/extracted_startup_code: app/index.html
         # Pull the JS out of the index so we can run tests against it.
         cat app/index.html | \
             sed -n '/<script id="app-startup">/,/<\/script>/p'| \
             head -n-1 | tail -n+2 > test/extracted_startup_code
 
 test/test_startup.js: test/test_startup.js.top test/test_startup.js.bottom \
@@ skipping 12 matching lines @@
 
 test-debug: build-debug test-prep
         ./test-server.sh debug
 
 test-prod: build-prod test-prep
         ./test-server.sh prod
 
 test-server: build-debug test-prep
         ./test-server.sh debug true
 
+test-prod-server: build-prod test-prep
+        ./test-server.sh prod true
+
 test-misc:
         PYTHONPATH=lib python test/test_deploy_charm_for_testing.py
 
 test:
         @echo "Deprecated. Please run either 'make test-prod' or 'make"
         @echo "test-debug', to test the production or debug environments"
         @echo "respectively.  Run 'make help' to list the main available "
         @echo "targets."
 
 server:
@@ skipping 123 matching lines @@
 appcache-force: appcache-touch $(APPCACHE)
 
 # targets are alphabetically sorted, they like it that way :-)
 .PHONY: appcache-force appcache-touch beautify build build-files \
         build-devel clean clean-all clean-deps clean-docs code-doc debug \
         devel docs dist gjslint help jshint lint main-doc prep prod recess \
         server spritegen test test-debug test-prep test-prod undocumented \
         view-code-doc view-docs view-main-doc yuidoc-lint
 
 .DEFAULT_GOAL := all