ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

- Makefile now works with freebsd (date command options are diff)

Browse source 
date still issues warning and ignores TZ

- Updated tests to work inside bsd jails (127 addresses are an issue)
Signed-off-by: Brian Coca <briancoca+ansible@gmail.com>
This commit is contained in:
Brian Coca 2012-08-27 23:06:39 -04:00
parent 00c4c5c4a1
commit 83d1028a21
5 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Makefile
View file

@ -1,5 +1,5 @@
#!/usr/bin/make #!/usr/bin/make
# WARN: gmake syntax
######################################################## ########################################################
# Makefile for Ansible # Makefile for Ansible
# #
@ -15,6 +15,7 @@
# variable section # variable section
NAME = "ansible" NAME = "ansible"
OS = $(shell uname -s)
# Manpages are currently built with asciidoc -- would like to move to markdown # Manpages are currently built with asciidoc -- would like to move to markdown
# This doesn't evaluate until it's called. The -D argument is the # This doesn't evaluate until it's called. The -D argument is the
@ -32,7 +33,12 @@ VERSION := $(shell cat VERSION)
ifneq ($(shell which git),) ifneq ($(shell which git),)
GIT_DATE := $(shell git log -n 1 --format="%ai") GIT_DATE := $(shell git log -n 1 --format="%ai")
endif endif
ifeq ($(OS), FreeBSD)
DATE := $(shell date -j -f "%Y-%m-%d %H:%M:%s" "$(GIT_DATE)" +%Y%m%d%H%M)
else
DATE := $(shell date --date="$(GIT_DATE)" +%Y%m%d%H%M) DATE := $(shell date --date="$(GIT_DATE)" +%Y%m%d%H%M)
endif
# RPM build parameters # RPM build parameters
RPMSPECDIR= packaging/rpm RPMSPECDIR= packaging/rpm

2
test/TestPlayBook.py
View file

@ -137,7 +137,7 @@ class TestPlaybook(unittest.TestCase):
print "**ACTUAL**" print "**ACTUAL**"
print utils.jsonify(actual, format=True) print utils.jsonify(actual, format=True)
expected = { expected = {
"127.0.0.2": { "localhost": {
"changed": 9, "changed": 9,
"failures": 0, "failures": 0,
"ok": 11, "ok": 11,

6
test/TestRunner.py
View file

@ -71,8 +71,8 @@ class TestRunner(unittest.TestCase):
# when using nosetests this will only show up on failure # when using nosetests this will only show up on failure
# which is pretty useful # which is pretty useful
print "RESULTS=%s" % results print "RESULTS=%s" % results
assert "127.0.0.2" in results['contacted'] assert "localhost" in results['contacted']
return results['contacted']['127.0.0.2'] return results['contacted']['localhost']
def test_ping(self): def test_ping(self):
result = self._run('ping', []) result = self._run('ping', [])
@ -193,7 +193,7 @@ class TestRunner(unittest.TestCase):
def test_fetch(self): def test_fetch(self):
input_ = self._get_test_file('sample.j2') input_ = self._get_test_file('sample.j2')
output = os.path.join(self.stage_dir, '127.0.0.2', input_) output = os.path.join(self.stage_dir, 'localhost', input_)
result = self._run('fetch', [ "src=%s" % input_, "dest=%s" % self.stage_dir ]) result = self._run('fetch', [ "src=%s" % input_, "dest=%s" % self.stage_dir ])
assert os.path.exists(output) assert os.path.exists(output)
assert open(input_).read() == open(output).read() assert open(input_).read() == open(output).read()

2
test/ansible_hosts
View file

@ -1,2 +1,2 @@
[somegroup] [somegroup]
127.0.0.2 localhost

2
test/assemble.d/01-source.txt
View file

@ -1,2 +1,2 @@
# This is the second comment. # This is the second comment.
127.0.0.2 localhost