gergely/taskwarrior-2.x
1
0
Fork 0
Code Issues Actions Packages Projects Releases 1 Wiki Activity

Merge branch 'master' into 2.3.0

Browse Source 
Conflicts:
	AUTHORS
	CMakeLists.txt
	INSTALL
	NEWS
	cmake.h.in
	doc/man/task-faq.5.in
	package-config/osx/README
	scripts/utils/verify_l10n
	src/API.h
	src/Config.cpp
	src/Context.cpp
	src/DOM.cpp
	src/Hooks.cpp
	src/TransportShell.h
	src/commands/CmdDiagnostics.cpp
	src/commands/CmdShell.cpp
	src/commands/CmdVersion.cpp
	src/en-US.h
	src/shell/Readline.h
	src/wcwidth6.cpp
	test/CMakeLists.txt
	test/color.uda.t
	test/duration.t.cpp
	test/hook.on-launch.t
	test/template.t
	test/uuid.t
This commit is contained in:
Paul Beckingham
2013-04-07 17:51:24 -04:00
parent 066d2a54ad 0fb9a4e979
commit 8af0a7f3ba
548 changed files with 13752 additions and 2435 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
test/feature.891.t
View File

@@ -2,7 +2,7 @@
################################################################################
## taskwarrior - a command line task list manager.
##
## Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
## Copyright 2006-2013, Paul Beckingham, Federico Hernandez.
##
## Permission is hereby granted, free of charge, to any person obtaining a copy
## of this software and associated documentation files (the "Software"), to deal
@@ -28,7 +28,8 @@
use strict;
use warnings;
use Test::More tests => 36;
use Time::Local;
use Test::More tests => 37;
# Create the rc file.
if (open my $fh, '>', 'bug.rc')
@@ -39,8 +40,21 @@ if (open my $fh, '>', 'bug.rc')
}
# Feature 891: UUID filter should be uuid.endswith by default
qx{../src/task rc:bug.rc add one 2>&1};
qx{../src/task rc:bug.rc add two 2>&1};
# Create some example data directly. This is so that we have complete control
# over the UUID.
if (open my $fh, '>', 'pending.data')
{
my $timeA = timegm (00,00,12,22,11,2008);
my $timeB = timegm (00,00,12,17,03,2009);
print $fh <<EOF;
[description:"one" entry:"$timeA" status:"pending" uuid:"a7097693-91c2-4cbe-ba89-ddcc87e5582c"]
[description:"two" entry:"$timeB" status:"pending" uuid:"e8f72d91-964c-424b-8fd5-556434648b6b"]
EOF
close $fh;
ok (-r 'pending.data', 'Created pending.data');
}
my $output = qx{../src/task rc:bug.rc 1 info 2>&1};
my ($uuid) = $output =~ /UUID\s+(\S{36})/ms;