~benji/charms/precise/juju-gui/remove-default-view-mode-config

« back to all changes in this revision

Viewing changes to Makefile

  • Committer: Francesco Banconi
  • Date: 2013-11-28 17:58:28 UTC
  • mfrom: (139.2.4 ftests-bootstrap-node)
  • Revision ID: francesco.banconi@canonical.com-20131128175828-hey77fo5aqf1er7u
Deploy the GUI to machine 0 in functional tests.

Also added guiserver info checks, and fixed the
deploy module so that the previous behavior of
"make deploy" is restored and the resulting
service name is not random generated.

Removed test_local_release: that scenario is
already tested in TestBuiltinServerLocalRelease.

Moved test_nrpe_check_available to 
TestBuiltinServerLocalRelease.

Tests: assuming ec2 is the name of your ec2
environment, run the following:
`time make ftest JUJU_ENV="ec2"`
Tests should pass and take ~25-30 minutes.

R=gary.poster, matthew.scott, jeff.pihach
CC=
https://codereview.appspot.com/34130043

Show diffs side-by-side

added added

removed removed

Lines of Context:
14
14
# You should have received a copy of the GNU Affero General Public License
15
15
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
16
16
 
17
 
JUJUTEST = juju-test --timeout=120m -v -e "$(JUJU_ENV)"
 
17
JUJUTEST = yes | juju-test --timeout=40m -v -e "$(JUJU_ENV)"
18
18
VENV = tests/.venv
19
19
SYSDEPS = build-essential bzr libapt-pkg-dev libpython-dev python-virtualenv \
20
20
        rsync xvfb