Gentoo Archives: gentoo-commits

From: Patrice Clement <monsieurp@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ruby/uuidtools/files/
Date: Mon, 31 Oct 2016 12:10:25
Message-Id: 1477915211.af97a5a5ef01b3bca5a0420d4dc3982f3e6a3ba9.monsieurp@gentoo
1 commit: af97a5a5ef01b3bca5a0420d4dc3982f3e6a3ba9
2 Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Mon Sep 26 16:25:48 2016 +0000
4 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
5 CommitDate: Mon Oct 31 12:00:11 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af97a5a5
7
8 dev-ruby/uuidtools: remove unused patch.
9
10 Closes: https://github.com/gentoo/gentoo/pull/2417
11
12 Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
13
14 .../files/uuidtools-2.1.2-macaddress.patch | 71 ----------------------
15 1 file changed, 71 deletions(-)
16
17 diff --git a/dev-ruby/uuidtools/files/uuidtools-2.1.2-macaddress.patch b/dev-ruby/uuidtools/files/uuidtools-2.1.2-macaddress.patch
18 deleted file mode 100644
19 index b5ebbc4..00000000
20 --- a/dev-ruby/uuidtools/files/uuidtools-2.1.2-macaddress.patch
21 +++ /dev/null
22 @@ -1,71 +0,0 @@
23 -From d29566188211e5511efece9319c524f7a278655c Mon Sep 17 00:00:00 2001
24 -From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes@×××××××××.eu>
25 -Date: Tue, 10 Jul 2012 01:18:34 -0700
26 -Subject: [PATCH] specs: do not fail tests if MAC address can't be fetched.
27 -MIME-Version: 1.0
28 -Content-Type: text/plain; charset=UTF-8
29 -Content-Transfer-Encoding: 8bit
30 -
31 -It's very well possible that depending on the capabilities of the
32 -process (and user) running the specs, the MAC address is not
33 -available. In this case, do not fail tests, simply skip over those if
34 -the mac address is unset.
35 -
36 -Solves issue #12.
37 -
38 -Signed-off-by: Diego Elio Pettenò <flameeyes@×××××××××.eu>
39 ----
40 - spec/uuidtools/mac_address_spec.rb | 6 +-----
41 - spec/uuidtools/uuid_creation_spec.rb | 2 +-
42 - spec/uuidtools/uuid_parsing_spec.rb | 2 +-
43 - 3 files changed, 3 insertions(+), 7 deletions(-)
44 -
45 -diff --git a/spec/uuidtools/mac_address_spec.rb b/spec/uuidtools/mac_address_spec.rb
46 -index 987ae36..f0ee146 100644
47 ---- a/spec/uuidtools/mac_address_spec.rb
48 -+++ b/spec/uuidtools/mac_address_spec.rb
49 -@@ -1,14 +1,10 @@
50 - require File.expand_path("../../spec_helper.rb", __FILE__)
51 -
52 --describe UUIDTools::UUID, "when obtaining a MAC address" do
53 -+describe UUIDTools::UUID, "when obtaining a MAC address", :unless => UUIDTools::UUID.mac_address.nil? do
54 - before do
55 - @mac_address = UUIDTools::UUID.mac_address
56 - end
57 -
58 -- it "should obtain a MAC address" do
59 -- @mac_address.should_not be_nil
60 -- end
61 --
62 - it "should cache the MAC address" do
63 - @mac_address.object_id.should == UUIDTools::UUID.mac_address.object_id
64 - end
65 -diff --git a/spec/uuidtools/uuid_creation_spec.rb b/spec/uuidtools/uuid_creation_spec.rb
66 -index 6f6b497..45b78a2 100644
67 ---- a/spec/uuidtools/uuid_creation_spec.rb
68 -+++ b/spec/uuidtools/uuid_creation_spec.rb
69 -@@ -13,7 +13,7 @@ describe UUIDTools::UUID, "when generating" do
70 - ).to_s.should == "15074785-9071-3fe3-89bd-876e4b9e919b"
71 - end
72 -
73 -- it "should correctly generate timestamp variant UUIDs" do
74 -+ it "should correctly generate timestamp variant UUIDs", :unless => UUIDTools::UUID.mac_address.nil? do
75 - UUIDTools::UUID.timestamp_create.should_not be_random_node_id
76 - UUIDTools::UUID.timestamp_create.to_s.should_not ==
77 - UUIDTools::UUID.timestamp_create.to_s
78 -diff --git a/spec/uuidtools/uuid_parsing_spec.rb b/spec/uuidtools/uuid_parsing_spec.rb
79 -index 56cfeee..fcfafeb 100644
80 ---- a/spec/uuidtools/uuid_parsing_spec.rb
81 -+++ b/spec/uuidtools/uuid_parsing_spec.rb
82 -@@ -23,7 +23,7 @@ describe UUIDTools::UUID, "when parsing" do
83 - UUIDTools::UUID.timestamp_create.should_not be_nil_uuid
84 - end
85 -
86 -- it "should not treat a timestamp version UUID as a random node UUID" do
87 -+ it "should not treat a timestamp version UUID as a random node UUID", :unless => UUIDTools::UUID.mac_address.nil? do
88 - UUIDTools::UUID.timestamp_create.should_not be_random_node_id
89 - end
90 -
91 ---
92 -1.7.8.6
93 -