Skip to content

Commit

Permalink
tests - clean up - three commits (#1903)
Browse files Browse the repository at this point in the history
* tests - cleanup rackup folder, add sleep.ru, add helpers/app.rb

* tests - change nextport to UniquePort.call, remove nextport, mutex

clean up, mutex removes port issues with parallel testing

* test_integration.rb - make UNIXSocket file names unique
  • Loading branch information
MSP-Greg authored and nateberkopec committed Sep 9, 2019
1 parent 18604d1 commit 9492e1e
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions test/test_integration.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,8 @@
# TODO: remove stdout logging, get everything out of my rainbow dots

class TestIntegration < Minitest::Test
<<<<<<< HEAD
HOST = "127.0.0.1"
TOKEN = "xxyyzz"
=======
HOST = '127.0.0.1'
>>>>>>> Fixes Cluster worker shutdown/restart (#1908)

def setup
@state_path = "test/test_#{name}_puma.state"
Expand Down

0 comments on commit 9492e1e

Please sign in to comment.