Skip to content

Commit 402b40f

Browse files
mathstufmathstuf
authored
Merge pull request #42 from mathstuf/clippy-in-tests
Clippy in tests
2 parents 94c2d4c + 315ffa4 commit 402b40f

17 files changed

+100
-87
lines changed

‎.cirrus.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ clippy_task:
66
cargo_cache:
77
folder: $CARGO_HOME/registry
88
fingerprint_script: cat Cargo.lock
9-
clippy_script: cargo clippy -- -D warnings
9+
clippy_script: cargo clippy --tests -- -D warnings
1010
before_cache_script: rm -rf $CARGO_HOME/registry/index
1111

1212
rustfmt_task:

‎src/constants.rs

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,31 +159,40 @@ fn test_keyring_ids() {
159159
}
160160

161161
#[test]
162-
fn test_permission_bits() {
162+
fn test_possessor_permission_bits() {
163163
assert_eq!(Permission::POSSESSOR_VIEW.bits, KEY_POS_VIEW);
164164
assert_eq!(Permission::POSSESSOR_READ.bits, KEY_POS_READ);
165165
assert_eq!(Permission::POSSESSOR_WRITE.bits, KEY_POS_WRITE);
166166
assert_eq!(Permission::POSSESSOR_SEARCH.bits, KEY_POS_SEARCH);
167167
assert_eq!(Permission::POSSESSOR_LINK.bits, KEY_POS_LINK);
168168
assert_eq!(Permission::POSSESSOR_SET_ATTRIBUTE.bits, KEY_POS_SETATTR);
169169
assert_eq!(Permission::POSSESSOR_ALL.bits, KEY_POS_ALL);
170+
}
170171

172+
#[test]
173+
fn test_user_permission_bits() {
171174
assert_eq!(Permission::USER_VIEW.bits, KEY_USR_VIEW);
172175
assert_eq!(Permission::USER_READ.bits, KEY_USR_READ);
173176
assert_eq!(Permission::USER_WRITE.bits, KEY_USR_WRITE);
174177
assert_eq!(Permission::USER_SEARCH.bits, KEY_USR_SEARCH);
175178
assert_eq!(Permission::USER_LINK.bits, KEY_USR_LINK);
176179
assert_eq!(Permission::USER_SET_ATTRIBUTE.bits, KEY_USR_SETATTR);
177180
assert_eq!(Permission::USER_ALL.bits, KEY_USR_ALL);
181+
}
178182

183+
#[test]
184+
fn test_group_permission_bits() {
179185
assert_eq!(Permission::GROUP_VIEW.bits, KEY_GRP_VIEW);
180186
assert_eq!(Permission::GROUP_READ.bits, KEY_GRP_READ);
181187
assert_eq!(Permission::GROUP_WRITE.bits, KEY_GRP_WRITE);
182188
assert_eq!(Permission::GROUP_SEARCH.bits, KEY_GRP_SEARCH);
183189
assert_eq!(Permission::GROUP_LINK.bits, KEY_GRP_LINK);
184190
assert_eq!(Permission::GROUP_SET_ATTRIBUTE.bits, KEY_GRP_SETATTR);
185191
assert_eq!(Permission::GROUP_ALL.bits, KEY_GRP_ALL);
192+
}
186193

194+
#[test]
195+
fn test_other_permission_bits() {
187196
assert_eq!(Permission::OTHER_VIEW.bits, KEY_OTH_VIEW);
188197
assert_eq!(Permission::OTHER_READ.bits, KEY_OTH_READ);
189198
assert_eq!(Permission::OTHER_WRITE.bits, KEY_OTH_WRITE);

‎src/tests/add.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ fn max_user_description() {
8181
let mut keyring = utils::new_test_keyring();
8282
// Subtract one because the NUL is added in the kernel API.
8383
let maxdesc: String = iter::repeat('a').take(*PAGE_SIZE - 1).collect();
84-
let res = keyring.add_key::<User, _, _>(maxdesc.as_ref(), "payload".as_bytes());
84+
let res = keyring.add_key::<User, _, _>(maxdesc.as_ref(), &b"payload"[..]);
8585
// If the user's quota is smaller than this, it's an error.
8686
if KEY_INFO.maxbytes < *PAGE_SIZE {
8787
assert_eq!(res.unwrap_err(), errno::Errno(libc::EDQUOT));
@@ -99,7 +99,7 @@ fn overlong_user_description() {
9999
// so this is being ignored here.
100100
let toolarge: String = iter::repeat('a').take(*PAGE_SIZE).collect();
101101
let err = keyring
102-
.add_key::<User, _, _>(toolarge.as_ref(), "payload".as_bytes())
102+
.add_key::<User, _, _>(toolarge.as_ref(), &b"payload"[..])
103103
.unwrap_err();
104104
assert_eq!(err, errno::Errno(libc::EINVAL));
105105
}
@@ -108,15 +108,15 @@ fn overlong_user_description() {
108108
fn invalid_keyring() {
109109
let mut keyring = utils::invalid_keyring();
110110
let err = keyring
111-
.add_key::<User, _, _>("invalid_keyring", "payload".as_bytes())
111+
.add_key::<User, _, _>("invalid_keyring", &b"payload"[..])
112112
.unwrap_err();
113113
assert_eq!(err, errno::Errno(libc::EINVAL));
114114
}
115115

116116
#[test]
117117
fn add_key_to_non_keyring() {
118118
let mut keyring = utils::new_test_keyring();
119-
let expected = "stuff".as_bytes();
119+
let expected = &b"stuff"[..];
120120
let key = keyring
121121
.add_key::<User, _, _>("add_key_to_non_keyring", expected)
122122
.unwrap();
@@ -131,7 +131,7 @@ fn add_key_to_non_keyring() {
131131
#[test]
132132
fn add_keyring_to_non_keyring() {
133133
let mut keyring = utils::new_test_keyring();
134-
let expected = "stuff".as_bytes();
134+
let expected = &b"stuff"[..];
135135
let key = keyring
136136
.add_key::<User, _, _>("add_keyring_to_non_keyring", expected)
137137
.unwrap();
@@ -147,7 +147,7 @@ fn add_keyring_to_non_keyring() {
147147
fn add_key() {
148148
let mut keyring = utils::new_test_keyring();
149149

150-
let payload = "payload".as_bytes();
150+
let payload = &b"payload"[..];
151151
let key = keyring.add_key::<User, _, _>("add_key", payload).unwrap();
152152
assert_eq!(key.read().unwrap(), payload);
153153
}
@@ -168,11 +168,11 @@ fn add_key_replace() {
168168

169169
let description = "add_key_replace";
170170

171-
let payload = "payload".as_bytes();
171+
let payload = &b"payload"[..];
172172
let key = keyring.add_key::<User, _, _>(description, payload).unwrap();
173173
assert_eq!(key.read().unwrap(), payload);
174174

175-
let payload = "updated_payload".as_bytes();
175+
let payload = &b"updated_payload"[..];
176176
let key_updated = keyring.add_key::<User, _, _>(description, payload).unwrap();
177177
assert_eq!(key, key_updated);
178178
assert_eq!(key.read().unwrap(), payload);

‎src/tests/clear.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ fn invalid_keyring() {
4040
fn clear_non_keyring() {
4141
let mut keyring = utils::new_test_keyring();
4242
let key = keyring
43-
.add_key::<User, _, _>("clear_non_keyring", "payload".as_bytes())
43+
.add_key::<User, _, _>("clear_non_keyring", &b"payload"[..])
4444
.unwrap();
4545

4646
// Try clearing a non-keyring.
@@ -96,7 +96,7 @@ fn clear_keyring_one_key() {
9696
let key_desc = "clear_keyring:key";
9797

9898
// Create a key.
99-
let payload = "payload".as_bytes();
99+
let payload = &b"payload"[..];
100100
keyring.add_key::<User, _, _>(key_desc, payload).unwrap();
101101

102102
let (keys, keyrings) = keyring.read().unwrap();
@@ -122,7 +122,7 @@ fn clear_keyring_many_keys() {
122122
assert_eq!(keyrings.len(), 0);
123123

124124
let count = 40;
125-
let payload = "payload".as_bytes();
125+
let payload = &b"payload"[..];
126126
let mut descs = Vec::with_capacity(count);
127127
for i in 0..count {
128128
let key_desc = format!("clear_keyring:key{:02}", i);

‎src/tests/describe.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ fn invalid_keyring() {
4848
fn non_existent_key() {
4949
let mut keyring = utils::new_test_keyring();
5050
let key = keyring
51-
.add_key::<User, _, _>("non_existent_key", "payload".as_bytes())
51+
.add_key::<User, _, _>("non_existent_key", &b"payload"[..])
5252
.unwrap();
5353

5454
keyring.unlink_key(&key).unwrap();
@@ -78,7 +78,7 @@ fn describe_key() {
7878
let mut keyring = utils::new_test_keyring();
7979
let description = "describe_key";
8080
let key = keyring
81-
.add_key::<User, _, _>(description, "payload".as_bytes())
81+
.add_key::<User, _, _>(description, &b"payload"[..])
8282
.unwrap();
8383

8484
let perms = Permission::POSSESSOR_ALL | Permission::USER_VIEW;
@@ -96,7 +96,7 @@ fn describe_key_no_perm() {
9696
let mut keyring = utils::new_test_keyring();
9797
let description = "describe_key_no_perm";
9898
let mut key = keyring
99-
.add_key::<User, _, _>(description, "payload".as_bytes())
99+
.add_key::<User, _, _>(description, &b"payload"[..])
100100
.unwrap();
101101

102102
let old_perms = key.description().unwrap().perms;
@@ -116,7 +116,7 @@ fn describe_key_no_perm() {
116116
fn describe_revoked_key() {
117117
let mut keyring = utils::new_test_keyring();
118118
let key = keyring
119-
.add_key::<User, _, _>("describe_revoked_key", "payload".as_bytes())
119+
.add_key::<User, _, _>("describe_revoked_key", &b"payload"[..])
120120
.unwrap();
121121

122122
let key_mirror = unsafe { Key::new(key.serial()) };

‎src/tests/instantiate.rs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ fn instantiate_invalid_key() {
3636
let key = utils::invalid_key();
3737
let manager = KeyManager::test_new(key);
3838

39-
let payload = "payload".as_bytes();
39+
let payload = &b"payload"[..];
4040
let err = manager.instantiate(None, payload).unwrap_err();
4141
assert_eq!(err, errno::Errno(libc::EPERM));
4242
}
@@ -65,14 +65,14 @@ fn negate_invalid_key() {
6565
#[test]
6666
fn instantiate_into_not_key() {
6767
let mut keyring = utils::new_test_keyring();
68-
let payload = "payload".as_bytes();
68+
let payload = &b"payload"[..];
6969
let key = keyring
7070
.add_key::<User, _, _>("instantiate_into_not_key", payload)
7171
.unwrap();
7272
let mut not_a_keyring = utils::key_as_keyring(&key);
7373
let manager = KeyManager::test_new(key);
7474

75-
let payload = "payload".as_bytes();
75+
let payload = &b"payload"[..];
7676
let err = manager
7777
.instantiate(&mut not_a_keyring, payload)
7878
.unwrap_err();
@@ -83,7 +83,7 @@ fn instantiate_into_not_key() {
8383
#[test]
8484
fn reject_into_not_key() {
8585
let mut keyring = utils::new_test_keyring();
86-
let payload = "payload".as_bytes();
86+
let payload = &b"payload"[..];
8787
let key = keyring
8888
.add_key::<User, _, _>("reject_into_not_key", payload)
8989
.unwrap();
@@ -102,7 +102,7 @@ fn reject_into_not_key() {
102102
#[test]
103103
fn negate_into_not_key() {
104104
let mut keyring = utils::new_test_keyring();
105-
let payload = "payload".as_bytes();
105+
let payload = &b"payload"[..];
106106
let key = keyring
107107
.add_key::<User, _, _>("negate_into_not_key", payload)
108108
.unwrap();
@@ -118,7 +118,7 @@ fn negate_into_not_key() {
118118
#[test]
119119
fn instantiate_already_instantiated() {
120120
let mut keyring = utils::new_test_keyring();
121-
let payload = "payload".as_bytes();
121+
let payload = &b"payload"[..];
122122
let key = keyring
123123
.add_key::<User, _, _>("instantiate_already_instantiated", payload)
124124
.unwrap();
@@ -131,7 +131,7 @@ fn instantiate_already_instantiated() {
131131
#[test]
132132
fn reject_already_instantiated() {
133133
let mut keyring = utils::new_test_keyring();
134-
let payload = "payload".as_bytes();
134+
let payload = &b"payload"[..];
135135
let key = keyring
136136
.add_key::<User, _, _>("reject_already_instantiated", payload)
137137
.unwrap();
@@ -146,7 +146,7 @@ fn reject_already_instantiated() {
146146
#[test]
147147
fn negate_already_instantiated() {
148148
let mut keyring = utils::new_test_keyring();
149-
let payload = "payload".as_bytes();
149+
let payload = &b"payload"[..];
150150
let key = keyring
151151
.add_key::<User, _, _>("negate_already_instantiated", payload)
152152
.unwrap();
@@ -160,7 +160,7 @@ fn negate_already_instantiated() {
160160
#[test]
161161
fn instantiate_unlinked_key() {
162162
let mut keyring = utils::new_test_keyring();
163-
let payload = "payload".as_bytes();
163+
let payload = &b"payload"[..];
164164
let key = keyring
165165
.add_key::<User, _, _>("instantiate_unlinked_key", payload)
166166
.unwrap();
@@ -177,7 +177,7 @@ fn instantiate_unlinked_key() {
177177
#[test]
178178
fn reject_unlinked_key() {
179179
let mut keyring = utils::new_test_keyring();
180-
let payload = "payload".as_bytes();
180+
let payload = &b"payload"[..];
181181
let key = keyring
182182
.add_key::<User, _, _>("reject_unlinked_key", payload)
183183
.unwrap();
@@ -196,7 +196,7 @@ fn reject_unlinked_key() {
196196
#[test]
197197
fn negate_unlinked_key() {
198198
let mut keyring = utils::new_test_keyring();
199-
let payload = "payload".as_bytes();
199+
let payload = &b"payload"[..];
200200
let key = keyring
201201
.add_key::<User, _, _>("negate_unlinked_key", payload)
202202
.unwrap();

‎src/tests/invalidate.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ fn invalid_keyring() {
5757
#[test]
5858
fn unlinked_key() {
5959
let mut keyring = utils::new_test_keyring();
60-
let payload = "payload".as_bytes();
60+
let payload = &b"payload"[..];
6161
let key = keyring
6262
.add_key::<User, _, _>("unlinked_key", payload)
6363
.unwrap();
@@ -79,7 +79,7 @@ fn invalidate_key() {
7979
assert!(keyrings.is_empty());
8080
}
8181

82-
let payload = "payload".as_bytes();
82+
let payload = &b"payload"[..];
8383
let key = keyring
8484
.add_key::<User, _, _>("invalidate_key", payload)
8585
.unwrap();
@@ -105,7 +105,7 @@ fn invalidate_keyring() {
105105
assert!(keyrings.is_empty());
106106
}
107107

108-
let payload = "payload".as_bytes();
108+
let payload = &b"payload"[..];
109109
let key = keyring
110110
.add_key::<User, _, _>("invalidate_keyring", payload)
111111
.unwrap();

‎src/tests/link.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ fn invalid_source() {
5050
#[test]
5151
fn link_to_non_keyring() {
5252
let mut keyring = utils::new_test_keyring();
53-
let payload = "payload".as_bytes();
53+
let payload = &b"payload"[..];
5454
let key = keyring
5555
.add_key::<User, _, _>("link_to_non_keyring", payload)
5656
.unwrap();
@@ -66,7 +66,7 @@ fn link_to_non_keyring() {
6666
#[test]
6767
fn link_unlinked_key() {
6868
let mut keyring = utils::new_test_keyring();
69-
let payload = "payload".as_bytes();
69+
let payload = &b"payload"[..];
7070
let key = keyring
7171
.add_key::<User, _, _>("link_unlinked_key", payload)
7272
.unwrap();
@@ -82,7 +82,7 @@ fn link_unlinked_key() {
8282
#[test]
8383
fn link_into_unlinked_keyring() {
8484
let mut keyring = utils::new_test_keyring();
85-
let payload = "payload".as_bytes();
85+
let payload = &b"payload"[..];
8686
let key = keyring
8787
.add_key::<User, _, _>("link_into_unlinked_keyring", payload)
8888
.unwrap();
@@ -231,7 +231,7 @@ fn multiply_link_key_into_keyring() {
231231
assert_eq!(keyrings.len(), 1);
232232
assert_eq!(keyrings[0], new_keyring);
233233

234-
let payload = "payload".as_bytes();
234+
let payload = &b"payload"[..];
235235
let key = new_keyring
236236
.add_key::<User, _, _>("multiply_link_key_into_keyring_key", payload)
237237
.unwrap();

‎src/tests/newring.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ fn unlinked_keyring() {
5555
#[test]
5656
fn not_a_keyring() {
5757
let mut keyring = utils::new_test_keyring();
58-
let payload = "payload".as_bytes();
58+
let payload = &b"payload"[..];
5959
let key = keyring
6060
.add_key::<User, _, _>("not_a_keyring_key", payload)
6161
.unwrap();

0 commit comments

Comments
 (0)