← Back to branch summary

~benji/charms/precise/juju-gui/make-etags-ignore-inode

« back to all changes in this revision

Viewing changes to tests/test_utils.py

  • Committer: Nicola Larosa
  • Date: 2013-07-31 15:45:55 UTC
  • mto: (87.2.1 integrate-builtin-server-2)
  • mto: This revision was merged to the branch mainline in revision 89.
  • Revision ID: nicola.larosa@canonical.com-20130731154555-aekmw8ur2dxutawi
Fix and add tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_utils.py
50
50
    start_agent,
51
51
    start_improv,
52
52
    write_apache_config,
 
53
    write_builtin_server_startup,
53
54
    write_gui_config,
54
55
    write_haproxy_config,
55
56
)
679
680
        self.assertIn(
680
681
            'Alias /test {0}/test/'.format(JUJU_GUI_DIR), apache_conf)
681
682
 
 
683
    def test_write_builtin_server_startup(self):
 
684
        write_builtin_server_startup(JUJU_GUI_DIR, 'api_url',
 
685
            api_version='go', serve_tests=True, ssl_path=self.ssl_cert_path,
 
686
            insecure=True)
 
687
        guiserver_conf = self.files['guiserver.conf']
 
688
        self.assertIn('description "GUIServer"', guiserver_conf)
 
689
        self.assertIn('--apiurl="api_url"', guiserver_conf)
 
690
        self.assertIn('--apiversion="go"', guiserver_conf)
 
691
        self.assertIn('--servetests', guiserver_conf)
 
692
        self.assertIn('--insecure', guiserver_conf)
 
693
 
682
694
    def test_write_gui_config_insecure(self):
683
695
        write_gui_config(
684
696
            False, 'This is login help.', True, True, self.charmworld_url,