← Back to branch summary

~nataliabidart/magicicada-server/embed-u1sync

« back to all changes in this revision

Viewing changes to magicicada/server/integration/run_integtests.py

  • Committer: Magicicada Bot
  • Author(s): Natalia
  • Date: 2016-08-31 12:38:06 UTC
  • mfrom: (72.1.1 protocol-from-chicharreros)
  • Revision ID: magicicada_bot-20160831123806-thhl9tiu66ec4o7e
[r=facundo] - Use protocol from chicharreros branch.
- Branch client and protocol sourcedeps as magicicada's projects.
- Simplify folder hierarchy a bit by getting rid of the build/ dir.

Show diffs side-by-side

added added

removed removed

Lines of Context:
magicicada/server/integration/run_integtests.py
53
53
DEP_STARTOAUTH = """
54
54
make start-oauth
55
55
"""
 
56
CLIENT_DIR = os.path.abspath(os.path.join('.sourcecode', 'magicicada-client'))
 
57
PROTOCOL_DIR = os.path.abspath(
 
58
    os.path.join('.sourcecode', 'magicicada-protocol'))
56
59
DEP_BUILDCLIENT = """
57
 
cd sourcecode/ubuntuone-client/
58
 
./autogen.sh --with-protocol=../ubuntuone-storage-protocol/
 
60
cd %s
 
61
./autogen.sh --with-protocol=%s
59
62
make
60
 
"""
 
63
""" % (CLIENT_DIR, PROTOCOL_DIR)
61
64
 
62
65
 
63
66
ROOT = utils.get_rootdir()
101
104
        print "Not ready! Hint: did you do...?:\n" + DEP_STARTOAUTH
102
105
        return True
103
106
 
104
 
    log_conf = os.path.join(ROOT, "sourcecode",
105
 
                            "ubuntuone-client", "data", "logging.conf")
 
107
    log_conf = os.path.join(CLIENT_DIR, "data", "logging.conf")
106
108
    if not os.path.exists(log_conf):
107
109
        print "Not ready! Hint: did you do...?:\n" + DEP_BUILDCLIENT
108
110
        return True
128
130
        f.write('\n')
129
131
 
130
132
    debug(prefix, "Launching SD with dbus", dbus_address)
131
 
    dev_launcher.launch("sourcecode/ubuntuone-client/bin/ubuntuone-syncdaemon",
132
 
                        username, params=("--send_events_over_dbus",
133
 
                                          "--udf_autosubscribe=true"),
134
 
                        environ=env, homedir=homedir, verbose=True)
 
133
    dev_launcher.launch(
 
134
        os.path.join(CLIENT_DIR, 'bin', 'ubuntuone-syncdaemon'),
 
135
        username,
 
136
        params=("--send_events_over_dbus", "--udf_autosubscribe=true"),
 
137
        environ=env, homedir=homedir, verbose=True)
135
138
 
136
139
 
137
140
class SyncDaemonToolProxy(object):