search

mushorg / glutton

Generic Low Interaction Honeypot
MIT License
244 stars 56 forks source link

http_test.go : Added tests #126

Closed sladyn98 closed 5 years ago

sladyn98 commented 5 years ago

Added tests for http_test.go. Increased coverage to 12.3%

glaslos commented 5 years ago

Please resolve the conflict

sladyn98 commented 5 years ago

Do you want me to include your commit into this could even rebase onto your branch which is a bit difficult.

glaslos commented 5 years ago

rebase or merge

sladyn98 commented 5 years ago

Cool I will try and rebase this branch asap.

glaslos commented 5 years ago

Please fix the tests

sladyn98 commented 5 years ago

Travis fails due to some problems in the previous test in the http test handler.Because I tested my branch on my local machine and tests were passing.

glaslos commented 5 years ago

Why are you merging into the http_test branch? This is a branch that might not be used. Please create a PR for master.

sladyn98 commented 5 years ago

I tried rebasing onto your branch because I thought you wanted to merge this branch into master.Anyway I will just do a rebase and resolve conflicts :+1:

glaslos commented 5 years ago

Please resolve the conflict. I really don't like you doing force pushes. I deletes history and I can't see what changes you made.