← Back to branch summary

~nataliabidart/magicicada-server/embed-u1sync

« back to all changes in this revision

Viewing changes to magicicada/server/testing/aq_helpers.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/testing/aq_helpers.py
57
57
from magicicada.testing.testcase import BaseTestCase
58
58
 
59
59
ROOT_DIR = os.getcwd()
60
 
SD_CONFIG_DIR = ROOT_DIR + "/.sourcecode/ubuntuone-client/data"
 
60
SD_CONFIG_DIR = os.path.join(
 
61
    ROOT_DIR, '.sourcecode', 'magicicada-client', 'data')
61
62
SD_CONFIGS = [os.path.join(SD_CONFIG_DIR, 'syncdaemon.conf'),
62
63
              os.path.join(SD_CONFIG_DIR, 'syncdaemon-dev.conf')]
63
64
 
258
259
 
259
260
 
260
261
# The following class is a duplicated from
261
 
# ubuntuone-client/tests/platform/linux/test_dbus.py
 
262
# lib/ubuntuone/platform/tests/ipc/test_linux.py
262
263
# will be removed when bug #917285 is resolved
263
264
class FakeNetworkManager(dbus.service.Object):
264
265
    """A fake NetworkManager that only emits StatusChanged signal."""