Merge lp:~nataliabidart/magicicada-server/testing-tarmac into lp:magicicada-server

[Natalia Bidart]

- Trivial fix to README to test tarmac landings.

[Natalia Bidart (nataliabidart)]

Voting does not meet specified criteria. Required: Approve >= 1, Disapprove == 0, Needs Fixing == 0, Needs Information == 0, Resubmit == 0, Pending == 0. Got: 1 Pending.

[Natalia Bidart (nataliabidart)]

Voting does not meet specified criteria. Required: Approve >= 1, Disapprove == 0, Needs Fixing == 0, Needs Information == 0, Resubmit == 0, Pending == 0. Got: 1 Pending.

[Natalia Bidart (nataliabidart)]

Trivial

review: Approve

[Natalia Bidart (nataliabidart)]

The attempt to merge lp:~nataliabidart/magicicada-server/testing-tarmac into lp:magicicada-server failed. Below is the output from the failed tests.

=== modified file 'README.txt'
--- README.txt	2015-09-02 13:41:11 +0000
+++ README.txt	2015-09-03 18:11:59 +0000
@@ -21,12 +21,12 @@
 Create the SSL certificates for client to communicate with server
 securely. These certificates need to be stored in the folder:
 
-~/filesync/certifs
+~/filesync/certs
 
 To do so:
 
-    mkdir ~/filesync/certifs
-    cd ~/filesync/certifs
+    mkdir ~/filesync/certs
+    cd ~/filesync/certs
 
 Now, generate a private key:
 
@@ -119,7 +119,7 @@
 
     ~/filesync/magicicada-protocol   <-- this is a subproject needed by the client
     ~/filesync/magicicada-client   <-- this is the proper filesync client
-    ~/filesync/certifs   <-- this is where you'll store the SSL certifs for the client
+    ~/filesync/certs   <-- this is where you'll store the SSL certs for the client
 
 So, branch and build the storage protocol:
 
@@ -128,14 +128,14 @@
     cd magicicada-protocol
     ./setup.py build
 
-Ensure the proper certificates are in the right folder:
+Ensure the proper certificate is the right folder, for the client you only need
+'cacert.pem':
 
-    ls ~/filesync/certifs
+    ls ~/filesync/certs
 
 You should see something like:
 
 -rw-rw-r-- 1 user user 765 Aug 13 09:18 cacert.pem
--rw-rw-r-- 1 user user 493 Aug 13 09:17 privkey.pem
 
 Also branch and build the client:
 
@@ -149,7 +149,7 @@
 Finally, start the client
 
     export $(dbus-launch)  # seems this is needed if you're inside a LXC or VPS
-    PYTHONPATH=. SSL_CERTIFICATES_DIR=~/filesync/certifs bin/ubuntuone-syncdaemon \
+    PYTHONPATH=. SSL_CERTIFICATES_DIR=~/filesync/certs bin/ubuntuone-syncdaemon \
         --auth=testuser:testpass --host=testfsyncserver \
         --port=21101 --logging-level=DEBUG