From 9c75196eb54d22c33ed44bc1f1052eaec7d4e12c Mon Sep 17 00:00:00 2001
From: Joseph Nuthalapati <njoseph@thoughtworks.com>
Date: Thu, 4 Jan 2018 19:18:27 +0530
Subject: [PATCH 1/2] Better explanation of xvfb in README.md file

- xvfb must be installed first
- --no-xvfb argument for development environments

Signed-off-by: Joseph Nuthalapati <njoseph@thoughtworks.com>
---
 README.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/README.md b/README.md
index ef1ce83..8720b12 100644
--- a/README.md
+++ b/README.md
@@ -5,6 +5,7 @@ $ sudo apt install python3-pytest
 $ pip3 install splinter
 $ pip3 install pytest-splinter
 $ pip3 install pytest-bdd
+$ sudo apt install xvfb  # optional, to avoid opening browser windows
 $ pip3 install pytest-xvfb  # optional, to avoid opening browser windows
 ```
 
@@ -49,3 +50,10 @@ can also specify which tests to run, by tag or keyword:
 ```
 $ py.test -k essential
 ```
+
+If xvfb is installed and you still want to see browser windows, use the 
+`--no-xvfb` command-line argument.
+
+```
+$ py.test --no-xvfb -k mediawiki
+```

From 8441d1f8f04115943f611e78305086cb344ea2eb Mon Sep 17 00:00:00 2001
From: Joseph Nuthalapati <njoseph@thoughtworks.com>
Date: Thu, 4 Jan 2018 19:22:40 +0530
Subject: [PATCH 2/2] Default password according to current password standards

The earlier password tester@123 is being rejected by django as it is too similar
to the username. Changed to a valid password.

Signed-off-by: Joseph Nuthalapati <njoseph@thoughtworks.com>
---
 README.md  | 2 +-
 config.ini | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 8720b12..40a9148 100644
--- a/README.md
+++ b/README.md
@@ -32,7 +32,7 @@ the host system at https://localhost:4430/.
 Create a new user as follows:
 
 * Username: tester
-* Password: tester@123
+* Password: testingtesting
 
 This step is optional if a fresh install of Plinth is being
 tested. Plinth-tester will create the required user using Plinth's
diff --git a/config.ini b/config.ini
index 701eccb..0478013 100644
--- a/config.ini
+++ b/config.ini
@@ -1,4 +1,4 @@
 [DEFAULT]
 url = https://localhost:4430
 username = tester
-password = tester
+password = testingtesting