summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKali Kaneko (leap communications) <kali@leap.se>2016-04-10 18:42:27 -0400
committerKali Kaneko (leap communications) <kali@leap.se>2016-04-10 18:42:27 -0400
commitc5de6f188dac491f114861648aafb30737da131f (patch)
tree327e20cabbbee4a656c4c57219b63fb0e501416d
parentd3604a9a53a04af8c34d08f17b4708c460f76be9 (diff)
move PoCs to its own subdir
-rw-r--r--Makefile22
-rwxr-xr-x[-rw-r--r--]server-solsync.py1
-rw-r--r--soledad_sync.py4
-rw-r--r--toys/Makefile20
-rw-r--r--toys/server.py (renamed from server.py)0
-rw-r--r--toys/server2.py (renamed from server2.py)0
-rw-r--r--toys/server3.py (renamed from server3.py)0
-rw-r--r--toys/tasks.py (renamed from tasks.py)0
8 files changed, 24 insertions, 23 deletions
diff --git a/Makefile b/Makefile
index 59bac0e..e943803 100644
--- a/Makefile
+++ b/Makefile
@@ -1,27 +1,7 @@
-# Simple PoC toys
-
-perf:
- httperf --server localhost --port 8080 --num-calls 200 --num-conns 20 --uri /
-
-perf-little:
- httperf --server localhost --port 8080 --num-calls 5 --num-conns 20 --uri /
-
-perf-easy:
- httperf --server localhost --port 8080 --num-calls 5 --num-conns 20 --uri /hi
-
-inline-server:
- python server.py
-
-thread-server:
- python server2.py
-
-ampoule-server:
- python server3.py
-
# Actual soledad sync
soledad-sync-server:
- python server-solsync.py
+ ./server-solsync.py
measure-ping:
httperf --server localhost --port 8080 --num-calls 5 --num-conns 20 --uri /ping
diff --git a/server-solsync.py b/server-solsync.py
index b183f86..d47b06f 100644..100755
--- a/server-solsync.py
+++ b/server-solsync.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
from klein import run, route
import soledad_sync as sync
diff --git a/soledad_sync.py b/soledad_sync.py
index 136b02c..ca93206 100644
--- a/soledad_sync.py
+++ b/soledad_sync.py
@@ -4,8 +4,8 @@ from twisted.internet import defer
# EDIT THIS TO MATCH YOUR TEST ENVIRONMENT -------------
UUID = 'deadbeef'
-HOST = 'http://futeisha:2323'
-# HOST = 'http://localhost:2323'
+#HOST = 'http://futeisha:2323'
+HOST = 'http://localhost:2323'
#NUM_DOCS = 20
NUM_DOCS = 1
PAYLOAD = '/tmp/payload'
diff --git a/toys/Makefile b/toys/Makefile
new file mode 100644
index 0000000..33761a1
--- /dev/null
+++ b/toys/Makefile
@@ -0,0 +1,20 @@
+# Simple PoC toys
+
+perf:
+ httperf --server localhost --port 8080 --num-calls 200 --num-conns 20 --uri /
+
+perf-little:
+ httperf --server localhost --port 8080 --num-calls 5 --num-conns 20 --uri /
+
+perf-easy:
+ httperf --server localhost --port 8080 --num-calls 5 --num-conns 20 --uri /hi
+
+inline-server:
+ python server.py
+
+thread-server:
+ python server2.py
+
+ampoule-server:
+ python server3.py
+
diff --git a/server.py b/toys/server.py
index 4afa31b..4afa31b 100644
--- a/server.py
+++ b/toys/server.py
diff --git a/server2.py b/toys/server2.py
index 268c7c5..268c7c5 100644
--- a/server2.py
+++ b/toys/server2.py
diff --git a/server3.py b/toys/server3.py
index d737d4b..d737d4b 100644
--- a/server3.py
+++ b/toys/server3.py
diff --git a/tasks.py b/toys/tasks.py
index 3f8b85d..3f8b85d 100644
--- a/tasks.py
+++ b/toys/tasks.py