Skip to content

Commit

Permalink
Fixed unit tests for release. StashTest in particular was assuming th…
Browse files Browse the repository at this point in the history
…at elegitTests was present, and that was unnecessary.
  • Loading branch information
Dave Musicant on Skittles authored and Dave Musicant on Skittles committed Mar 16, 2017
1 parent 85fa5cc commit 17dd792
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 11 deletions.
4 changes: 2 additions & 2 deletions src/test/java/elegit/CommitLabelTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ public void testAddFileAndCommit() throws Exception {
//commitTreeModel.update();

// Sleep to ensure worker threads finish
Thread.sleep(5000);
Thread.sleep(6000);

// Get the information about the new commit
CommitHelper newHead = this.helper.getCommit("master");
Expand All @@ -133,7 +133,7 @@ public void testAddFileAndCommit() throws Exception {
this.helper.commit("Modified file.txt in a unit test again!");

// Sleep to ensure worker threads finish
Thread.sleep(5000);
Thread.sleep(6000);

// Get the information about this new commit
String oldHeadID = newHeadID;
Expand Down
11 changes: 2 additions & 9 deletions src/test/java/elegit/StashTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -74,15 +74,8 @@ void removeAllFilesFromDirectory(File dir) {
void initializeRepo() throws Exception {
authData = new File(testFileLocation + "httpUsernamePassword.txt");

// If a developer does not have this file present, test should just pass.
if (!authData.exists() && looseTesting)
return;

Scanner scanner = new Scanner(authData);
String ignoreURL = scanner.next();
String username = scanner.next();
String password = scanner.next();
UsernamePasswordCredentialsProvider credentials = new UsernamePasswordCredentialsProvider(username, password);
// This repo doesn't check username/password for read-only
UsernamePasswordCredentialsProvider credentials = new UsernamePasswordCredentialsProvider("", "");

String remoteURL = "https://github.com/TheElegitTeam/ResetTesting.git";

Expand Down

0 comments on commit 17dd792

Please sign in to comment.