rename: test pass done

smarttradeapp · Oct 17, 2015 · 67ffa6b · 67ffa6b
1 parent 4200ab8
commit 67ffa6b
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 15 deletions.
diff --git a/demo/demo/settings_test.py b/demo/demo/settings_test.py
@@ -103,15 +103,15 @@
 STATIC_URL = '/static/'
 
 # CouchBase Stuff
-COUCHBASE_BUCKET = 'cbtools_test'
+COUCHBASE_BUCKET = 'default_test'
 COUCHBASE_HOSTS = ['127.0.0.1']
 COUCHBASE_PASSWORD = None
-COUCHBASE_DESIGN = 'cbtools_test'
+COUCHBASE_DESIGN = 'default_test'
 COUCHBASE_STALE = False
-SYNC_GATEWAY_BUCKET = 'cbtools_test'
+SYNC_GATEWAY_BUCKET = 'default_test'
 SYNC_GATEWAY_URL = 'http://127.0.0.1:4984'
 SYNC_GATEWAY_ADMIN_URL = 'http://127.0.0.1:4985'
-SYNC_GATEWAY_USER = "cbtools_test_admin"
-SYNC_GATEWAY_PASSWORD = "cbtools_test_admin_password"
-SYNC_GATEWAY_GUEST_USER = "cbtools_test_guest"
-SYNC_GATEWAY_GUEST_PASSWORD = "cbtools_test_guest_password"
+SYNC_GATEWAY_USER = "test_admin"
+SYNC_GATEWAY_PASSWORD = "test_admin_password"
+SYNC_GATEWAY_GUEST_USER = "test_guest"
+SYNC_GATEWAY_GUEST_PASSWORD = "test_guest_password"
diff --git a/demo/requirements.txt b/demo/requirements.txt
@@ -2,9 +2,11 @@ couchbase==2.0.2
 Django==1.8.3
 django-extensions==1.5.5
 django-tastypie==0.12.2
+meld3==1.0.2
 python-dateutil==2.4.2
 python-mimeparse==0.1.4
 requests==2.7.0
 shortuuid==0.4.2
 six==1.9.0
+supervisor==3.1.3
 wheel==0.24.0
diff --git a/demo/sync-gateway/supervisord.conf b/demo/sync-gateway/supervisord.conf
@@ -1,19 +1,18 @@
 [program:sync-gateway]
-command=/opt/couchbase-sync-gateway/bin/sync_gateway /vagrant/sync-gateway/sync-gateway.json
-directory=/vagrant
+command=/opt/couchbase-sync-gateway/bin/sync_gateway /vagrant/demo/sync-gateway/sync-gateway.json
 autostart=true
 autorestart=true
 redirect_stderr=true
 
 [unix_http_server]
-file=/home/vagrant/logs/supervisor.sock   ; (the path to the socket file)
+file=/home/vagrant/supervisor.sock   ; (the path to the socket file)
 
 [supervisord]
-logfile=/home/vagrant/logs/supervisord.log ; (main log file;default $CWD/supervisord.log)
+logfile=/home/vagrant/supervisord.log ; (main log file;default $CWD/supervisord.log)
 logfile_maxbytes=50MB        ; (max main logfile bytes b4 rotation;default 50MB)
 logfile_backups=10           ; (num of main logfile rotation backups;default 10)
 loglevel=info                ; (log level;default info; others: debug,warn,trace)
-pidfile=/home/vagrant/logs/supervisord.pid ; (supervisord pidfile;default supervisord.pid)
+pidfile=/home/vagrant/supervisord.pid ; (supervisord pidfile;default supervisord.pid)
 nodaemon=false               ; (start in foreground if true;default false)
 minfds=1024                  ; (min. avail startup file descriptors;default 1024)
 minprocs=200                 ; (min. avail process descriptors;default 200)
@@ -22,4 +21,4 @@ minprocs=200                 ; (min. avail process descriptors;default 200)
 supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
 
 [supervisorctl]
-serverurl=unix:///home/vagrant/logs/supervisor.sock ; use a unix:// URL  for a unix socket
+serverurl=unix:///home/vagrant/supervisor.sock ; use a unix:// URL  for a unix socket
diff --git a/demo/sync-gateway/sync-gateway.json b/demo/sync-gateway/sync-gateway.json
@@ -5,9 +5,9 @@
             "server": "http://127.0.0.1:8091",
             "bucket": "default"
         },
-        "django_couchbase_test": {
+        "default_test": {
             "server": "http://127.0.0.1:8091",
-            "bucket": "django_couchbase_test"
+            "bucket": "default_test"
         }
     }
 }